- 21 Nov, 2016 12 commits
-
-
Felipe Artur authored
-
Sean McGivern authored
Backport some changes done from Time Tracking feature in EE. See merge request !7604
-
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
-
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
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Robert Schilling 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 20 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
-
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
-
Kamil Trzciński authored
Fix pipeline author for Slack and use pipeline id for pipeline link [Context](https://gitlab.slack.com/archives/runner-builds/p1479238493000018) Pipeline Slack message: > gitlab-org/gitlab-ci-multi-runner: Pipeline 8bed2a3b of fix/handle-failed-state-while-patching-trace branch by failed in 1389 seconds Quotes: > @godfat Take a look at these notifications, they seems to be missing author and should probably use Pipeline ID instead of SHA See merge request !7506
-
Kamil Trzciński authored
Fix faulty deployment refs In the 8.13 RC cycle, so before the release, there was a time in which references in git where stored by id instead of iid. This could be fixed by time, if the iid catches up with the id, it overwrites it. But in the mean time we have wrong refs in the folder. This commit fixes that. For all projects we have deployments we'll find the ones where the ref has a higher number than the iid is now and calls `#create_ref` on the corresponding deployment. Fixes gitlab-com/infrastructure#683 cc @ayufan One worry: I tested this locally, couldn't find a way to do automate this. See merge request !7352
-
Douwe Maan authored
Add logging for rack attack events Patch for issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/15612 and partial patch for https://gitlab.com/gitlab-com/support/issues/119. Also related: https://gitlab.com/gitlab-org/gitlab-ce/issues/22527 Adds logging for throttle and blacklist rack attack events to the production log. @stanhu @MrChrisW See merge request !7585
-
kkkkkkkk authored
-
Clement Ho authored
-
Alfredo Sumaran authored
Fix typo in Build page JavaScript ## What does this MR do? fixes #24614 See merge request !7563
-
Ruben Davila authored
-
- 18 Nov, 2016 8 commits
-
-
Fatih Acet authored
Fix broken commit metadata loading for large repository trees ## What does this MR do? Fixes a regression introduced in !7208 in which a call to `ajaxGet()` would fail when loading metadata for large repository trees. This call produced no errors in the console because it is contained in a sort of `eval` block in jQuery. This is an ugly, easily broken method for loading data asynchronously whose problems were exemplified by this issue. I'm opening a separate issue (#24660) to alter this implementation. ## Why was this MR needed? The failing AJAX call was causing metadata to stop loading, and the `timeago` functionality to stop running due to script failure. ## Screenshots (if relevant) ![Screen_Shot_2016-11-18_at_2.03.13_PM_copy](/uploads/ab0c11d5c405c01d8e45818b3ca96f23/Screen_Shot_2016-11-18_at_2.03.13_PM_copy.png) ## Does this MR meet the acceptance criteria? - [ ] All builds are passing - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) ## What are the relevant issue numbers? Closes #24652 See merge request !7588
-
Semyon Pupkov authored
-
Kamil Trzcinski authored
-
Semyon Pupkov authored
-
Fatih Acet authored
makes compare previous version link easily clickable ## What does this MR do? This MR does a minor fix about `Compare previous link` which is not easily clickable when long commit list are expanded ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? For better UX and make browse easy ## Screenshots (if relevant) **Before:** ![BrRs](/uploads/11e60ef150a9035ae94d6ed69c3038b5/BrRs.gif) **After** ![2016-11-19_02.02.42](/uploads/961bac1ddcdc4338ac72bc690c52b7f1/2016-11-19_02.02.42.gif) ## 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 - [x] All builds are passing - [ ] 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24658 See merge request !7587
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-
Ido Leibovich authored
Add a new endpoint in the new API for creating a new pipeline, and return the details of that pipeline.
-