summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'axil/gitlab-ce-typos_runners_pages' into 'master' Achilleas Pipinellis2016-09-297-38/+42
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix grammar and typos in Runners pages _Originally opened at !1791 by @axil._ - - - ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6547
| * Fix grammar and typos in Runners pagesaxil/gitlab-ce-typos_runners_pagesAchilleas Pipinellis2016-09-287-38/+42
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Fixes long commit messages overflow viewport in file treeFilipa Lacerda2016-09-291-1/+6
| |
* | Merge branch 'fix-html5-color-inputs' into 'master' Annabel Dunstone Gray2016-09-293-4/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove instances of HTML5 input type="color" due to inconsistent browser support ## What does this MR do? `<input type="color" />` renders differently across browsers. Reverting to `type="text"` where necessary. ## Screenshots (if relevant) Safari (top) vs Chrome (bottom) ![Screen_Shot_2016-09-28_at_11.53.02_AM](/uploads/f967ed988320cbd2e4357cdfcfe7a813/Screen_Shot_2016-09-28_at_11.53.02_AM.png) See merge request !6576
| * | remove instances of <input type="color" /> due to inconsistent browser supportMike Greiling2016-09-293-4/+4
| | |
* | | make sure split-view diff discussions are made visible by "toggle comments" ↵21535-fix-hidden-diff-commentsMike Greiling2016-09-291-1/+1
| | | | | | | | | | | | button
* | | fix typo "this files" -> "this file"Mike Greiling2016-09-291-1/+1
|/ /
* | Add '.well-known' to the list of reserved namespacesrs-blacklist-well-knownRobert Speicher2016-09-291-2/+3
| | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/22759
* | Revert "Merge branch ↵Jacob Schatz2016-09-295-49/+0
| | | | | | | | | | '18297-i-would-like-text-to-wrap-when-in-edit-mode-on-web-app' into 'master'" This reverts merge request !6188
* | Merge branch 'pipelines-for-commit' into 'master' Fatih Acet2016-09-288-21/+37
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Pipelines for Commit ## What does this MR do? This adds a Pipelines for Commit. I used existing view that we use to show pipelines. However, this is completely ugly with a lot of redundancy. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-09-13_at_13.43.38](/uploads/0ac6e7d4825e32dba7ff7ab051da837c/Screen_Shot_2016-09-13_at_13.43.38.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 you do - 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? Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/18937 See merge request !6322
| * | Rearranged commit tabs and changed commit `Commit` column header to `Pipeline`pipelines-for-commitLuke Bennett2016-09-273-6/+6
| | | | | | | | | | | | Changed `Commit` column header to `Pipeline` on pipeline index
| * | Commit status icon now links to pipelines tab of commit viewLuke Bennett2016-09-273-10/+13
| | | | | | | | | | | | | | | | | | Removed commit from pipeline list items Used local_assigns and changed to positive naming ffor boolean props
| * | Add Pipelines for CommitKamil Trzcinski2016-09-274-9/+22
| | |
* | | Merge branch ↵Douwe Maan2016-09-282-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '22592-can-set-due-date-through-slash-commands-even-though-i-m-not-authorized-to' into 'master' Fix permission for setting an issue's due date ## What does this MR do? This merge request ensure the current user can `:admin_issue` in order to change the issue's `due_date`, in `BaseIssuableService` and in `SlashCommands::InterpretService`. Closes #22592 ## Are there points in the code the reviewer needs to double check? No. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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) - [ ] 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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6539
| * | | Fix permission for setting an issue's due dateRémy Coutable2016-09-282-2/+3
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Added CHANGELOG entry.Fatih Acet2016-09-281-0/+2
| | | |
* | | | Review changesLuke Bennett2016-09-286-41/+33
| | | |
* | | | Added soft wrap logic and button to editorLuke Bennett2016-09-286-2/+57
|/ / / | | | | | | | | | | | | | | | Added tests Added awesomeeeeee icons
* | | Fix duplicate master entries in the mr versions dropdownDmitriy Zaporozhets2016-09-281-5/+5
| |/ |/| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Changed to hash rocket and string 'true'Luke Bennett2016-09-271-1/+1
|/
* Merge branch 'label-update-check-new' into 'master' Jacob Schatz2016-09-271-1/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send ajax request for label update only if they are changed ## What does this MR do? At the moment we send requests to update the labels on issue even if nothing has been changed. This fixes that and only sends requests when something has actually been changed. The code gets the initial selected values based on the inputs & then compares that to the selected values when submitting. If they are equal, then no request is sent. ## What are the relevant issue numbers? Closes #19472 See merge request !5071
| * Send ajax request for label update only if they are changed (#19472 !5071)label-update-check-newPhil Hughes2016-09-271-1/+10
| |
* | Merge branch '22472-wrong-table-head' into 'master' Fatih Acet2016-09-271-7/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pipelines table headers ## What does this MR do? Removed stages loop for a single 'Stages' header. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? The headers were messing the table up. Note the redundant headers and squished cells. ![Screen_Shot_2016-09-27_at_14.40.51](/uploads/331b08c30a4af59cefc460ab4f3c2a61/Screen_Shot_2016-09-27_at_14.40.51.png) ## Screenshots (if relevant) ![Screen_Shot_2016-09-27_at_14.39.04](/uploads/687895e9152d4fe8d8f3bfc1233af39b/Screen_Shot_2016-09-27_at_14.39.04.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 you do - 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 #22472 See merge request !6542
| * | Removed stages loop for a single 'Stages' header22472-wrong-table-headLuke Bennett2016-09-271-7/+1
| | |
* | | Merge branch 'includes-projects-to-render-issue-notes' into 'master' Yorick Peterse2016-09-271-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix IssuesController#show degradation including project on loaded notes See merge request !6540
| * | | Fix IssuesController#show degradation including project on loaded notesincludes-projects-to-render-issue-notesPaco Guzman2016-09-271-1/+1
| | |/ | |/|
* | | Be nice to Docker Clients talking to JWT/authKamil Trzcinski2016-09-272-7/+25
|/ /
* | Merge branch 'issue-boards-label-filter-fix' into 'master' Fatih Acet2016-09-271-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue board label filtering not removing labels ## What does this MR do? When trying to remove a label filter it would actually add it instead making it impossible to remove the label filter without modifying the URL. This fixes that by correctly removing the label from the filter. ## What are the relevant issue numbers? Closes #21417 See merge request !6208
| * | Fixed issue board label filtering not removing labelsPhil Hughes2016-09-071-3/+3
| | | | | | | | | | | | Closes #21417
* | | Merge branch 'rs-merge_commit_message' into 'master' doc-setup-sshRobert Speicher2016-09-271-7/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve how MergeCommit#merge_commit_message builds the message Now a merge request with a blank description will no longer produce a merge commit message like this: ``` Merge branch 'foo' into 'master' Bring the wonders of foo into the world See merge request !7283 ``` What an improvement! :tada: See merge request !6450
| * | | Improve how MergeCommit#merge_commit_message builds the messageRobert Speicher2016-09-271-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now a merge request with a blank description will no longer produce a merge commit message like this: ``` Merge branch 'foo' into 'master' Bring the wonders of foo into the world See merge request !7283 ``` What an improvement! :tada:
* | | | Merge branch 'dz-profile-organization' into 'master' Dmitriy Zaporozhets2016-09-273-2/+10
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add organization field to the user profile ## What does this MR do? Add organization field to the user profile ## Are there points in the code the reviewer needs to double check? no ## Why was this MR needed? So we can let users fill organization information separately ## Screenshots (if relevant) ![Screen_Shot_2016-09-26_at_7.32.27_PM](/uploads/d11a9a86aa22227f9c9915d195106c5f/Screen_Shot_2016-09-26_at_7.32.27_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [x] API support added - Tests - [x] Added for this feature/bug - [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 you do - 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? https://gitlab.com/gitlab-org/gitlab-ce/issues/21903 See merge request !6526
| * | | Dispaly organization name at user pageDmitriy Zaporozhets2016-09-271-1/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add organization field to user profileDmitriy Zaporozhets2016-09-272-1/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'rc-new-members-approve-request-access-service' into 'master' Douwe Maan2016-09-272-6/+32
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New `Members::ApproveAccessRequestService` Part of #21979. ## Does this MR meet the acceptance criteria? - [x] API support added - Tests - [x] 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) - [ ] 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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6266
| * | | Inverse condition in Members::ApproveAccessRequestServicerc-new-members-approve-request-access-serviceRémy Coutable2016-09-221-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Ensure Members::ApproveAccessRequestService can fin a requester by IDRémy Coutable2016-09-222-2/+3
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | New Members::ApproveAccessRequestServiceRémy Coutable2016-09-222-6/+31
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'lfs-helper-doc-link' into 'master' Douwe Maan2016-09-271-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use GitLab Routing helpers for the documentation URL in `LfsHelper` To reduce conflicts from changes introduced in gitlab-org/gitlab-ee!740 https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/740#note_15782550 See merge request !6529
| * | | | Use GitLab Routing helpers for the documentation URL in `LfsHelper`lfs-helper-doc-linkPatricio Cano2016-09-261-3/+5
| | | | |
* | | | | Merge branch '22578-cycle-analytics-incorrect-commit-count'Douwe Maan2016-09-271-5/+23
|\ \ \ \ \
| * | | | | Fix the "Commits" section of the cycle analytics summary.Timothy Andrew2016-09-261-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The commit count was capped at 10, due to `Gitlab::Git::Repository#log` enforcing a limit, with the default set to 10. - Reimplement a small portion of this `log` function to get just the data we need.
* | | | | | Merge branch 'fix-unsubscribe-header'Douwe Maan2016-09-271-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Wrap List-Unsubscribe link in angle bracketsfix-unsubscribe-headerSean McGivern2016-09-261-1/+1
| |/ / / /
* | | | | Merge branch 'cs-inline-js-search' into 'master' Fatih Acet2016-09-273-31/+47
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove inline JavaScript for Search autocomplete ## What does this MR do? Remove inline JavaScript from the search partial for Search autocomplete. ## Are there points in the code the reviewer needs to double check? That this doesn't break anything (it didn't when I tested it!) ## Why was this MR needed? Inline scripts are bad, this removes a few of them. ## What are the relevant issue numbers? #18231 and #19866 ## Does this MR meet the acceptance criteria? - Tests - [ ] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5284
| * | | | | Tidy up the code a bitcs-inline-js-searchAlfredo Sumaran2016-08-262-22/+20
| | | | | |
| * | | | | Fix dropdown vertical positionAlfredo Sumaran2016-08-261-1/+1
| | | | | |
| * | | | | Move data attribute information to relevant elements.Connor Shea2016-08-261-11/+9
| | | | | |
| * | | | | Remove inline JavaScript for Search autocomplete.Connor Shea2016-08-262-21/+41
| | | | | |
* | | | | | Merge branch 'improvement/project-with-board-factory' into 'master' Robert Speicher2016-09-271-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve project_with_board factory to create the default lists ## What does this MR do? Create the default lists after creating a project with the `project_with_board` factory. This makes the setup phase on tests be more simpler. ## Why was this MR needed? These two lists are present in every issue board, so we don't have to create them manually in every test. See merge request !6480
View Lorry Controller Status