- 22 Nov, 2016 1 commit
-
-
Dimitrie Hoekstra authored
-
- 21 Nov, 2016 25 commits
-
-
Dimitrie Hoekstra authored
-
Dimitrie Hoekstra authored
Converted all status icons to be managed by scss colors only and deleted any classes or styles within the svg's, plus gave status badges a hover style only if clickable
-
Dimitrie Hoekstra authored
-
Sean McGivern authored
Added permissions per stage to cycle analytics endpoint See merge request !7613
-
Fatih Acet authored
Merge branch '24552-js-environment-timeago-is-not-rendered-and-text-shows-object-object-in-mr-widget' into 'master' Fix timeago rendering for environment timeago ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24552 See merge request !7539
-
Kamil Trzciński authored
Merge branch '24616-mr-shows-the-build-for-this-merge-request-failed-although-builds-still-running' into 'master' Resolve "MR shows "The build for this merge request failed" although builds still running" Closes #24616 See merge request !7579
-
Kamil Trzciński authored
Do not create TODO when build is allowed to fail ## What does this MR do? Do not create a TODO when build that failed is allowed to fail. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [ ] All builds are passing ## What are the relevant issue numbers? Closes #22280 See merge request !7618
-
Rémy Coutable authored
Also allow merge request to be merged with skipped pipeline and the "only allow merge when pipeline is green" feature enabled Signed-off-by:
Rémy Coutable <remy@rymai.me>
-
James Lopez authored
-
Sean McGivern authored
Backport some changes done from Time Tracking feature in EE. See merge request !7604
-
Grzegorz Bizon authored
-
Rémy Coutable authored
Grapify the users API Certain endpoints return different entities based on which user issues the request. Right now, I am not aware how to specify multiple entities as part of the description block of the endpoint. @rymai Do you know something about that. ## What are the relevant issue numbers? Related to #22928 See merge request !7147
-
Grzegorz Bizon authored
-
Grzegorz Bizon authored
-
Rémy Coutable authored
Remove bashism from scripts/prepare_build.sh Make `scripts/prepare_build.sh` an sh, rather than bash, script Write once, run everywhere. Even alpine. See merge request !7561
-
Rémy Coutable authored
Add constraints to group id in routing To prevent 404 when visit page like https://gitlab.com/groups/group.with.dot/activity Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24622 See merge request !7614
-
Rémy Coutable authored
Add API endpoint for creating a pipeline Fixes #23468 See merge request !7209
-
Sean McGivern authored
Allow to block JIRA events for commits and merge requests implements #5541 See merge request !7469
-
Rémy Coutable authored
Remove unnecessary self from user model self keyword nod needed. Code is more clean and understandable. https://github.com/bbatsov/ruby-style-guide#no-self-unless-required See merge request !7551
-
Rémy Coutable authored
Use build instead create in BroadcastMessage model spec See merge request !7592
-
James Lopez authored
-
Dmitriy Zaporozhets authored
Signed-off-by:
Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Robert Schilling authored
-
James Lopez authored
-
Rémy Coutable authored
Fixes regression causing an error message to appear when user first enters the Merge Request form. Closes #24627 See merge request !7599
-
- 19 Nov, 2016 14 commits
-
-
Fatih Acet authored
Revert signin tab order fix. The history: > 1. @sytses created this: https://gitlab.com/gitlab-org/gitlab-ce/issues/23279 > 2. The fix was submitted here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6867 > 3. I [made](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6867#note_16993324) the same observation you did after it was merged 4. A long discussion about accessibility and UX followed, and we decided to revert all changes (https://gitlab.com/gitlab-org/gitlab-ce/issues/23698). ## Screenshots (if relevant) ![2016-11-17_20.55.22](/uploads/c81b0bbe0cd08747124531778af6273f/2016-11-17_20.55.22.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23698 See merge request !7538
-
Kamil Trzciński authored
Remove duplicate sidekiq throttling parameters Improves `db/schema` after merging https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7015. cc @grzesiek @filipa See merge request !7603
-
Kamil Trzcinski authored
-
Achilleas Pipinellis authored
Fix a typo in gitlab_flow.md ('munch'->'much') See merge request !7595
-
Achilleas Pipinellis authored
Fix wrong link Not a big one, just fix a wrong link to internal page. See merge request !7597
-
Clement Ho authored
-
Jacob Schatz authored
Fix broken merge request widget spec ## What does this MR do? Converts the invalid es6 syntax of the merge_request_widget_spec which is actually causing the spec not to run through teaspoon ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Get specs working again ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24673 See merge request !7594
-
Fatih Acet authored
Resolve "Display "folders" for environments" ## What does this MR do? Adds the ability to show the grouped environments inside "folders". Adds several reusable vue components in order to accomplish the recursive tree data structure presented. For the individual components, Jasmine tests were added. For the ones that depend of an API response, rspec tests are used. ## Screenshots (if relevant) ![Screen_Shot_2016-11-16_at_02.00.13](/uploads/1278012c8639b999b53f080728d283e1/Screen_Shot_2016-11-16_at_02.00.13.png) ![Screen_Shot_2016-11-16_at_02.00.25](/uploads/a3d65416ddb553e1b8f0f4c8897a75dc/Screen_Shot_2016-11-16_at_02.00.25.png) ![Screen_Shot_2016-10-17_at_16.08.50](/uploads/af63efe1d2cbd5fc069408622ef4b607/Screen_Shot_2016-10-17_at_16.08.50.png) ![environments](/uploads/b5a1801766d82ab176fc60f96b6968cb/environments.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22539 See merge request !7015
-
Alex Sanford authored
Merge request !7163 caused an error message to appear on the Merge Request form when it was first loaded by the user. This commit fixes that regression bug.
-
ebuildy authored
-
Filipa Lacerda authored
-
Filipa Lacerda authored
-
Filipa Lacerda authored
-
Kamil Trzciński authored
Make job script a required configuration entry ## What does this MR do? This MR makes a job script a required configuration entry. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug - [x] All builds are passing ## What are the relevant issue numbers? Closes #24575 See merge request !7566
-