summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Debounce GfmAutoComplete setup and simplify code somewhat.bpj-mr-loopBryce Johnson2016-10-071-24/+14
|
* Merge branch '23025-issue-boards-defaults' into 'master' Jacob Schatz2016-10-061-4/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change issue board defaults #### What does this MR do? Changes the issue board default list from `Development`, `Testing`, `Production`, `Ready` to `To Do` and `Doing` #### Screenshots (if relevant) ![Screen_Shot_2016-10-06_at_8.46.48_AM](/uploads/6e73e03f5749f18b95bd7e23c676603d/Screen_Shot_2016-10-06_at_8.46.48_AM.png) ![Screen_Shot_2016-10-06_at_9.07.06_AM](/uploads/cadd3af74e3adb73fe854478ce95120e/Screen_Shot_2016-10-06_at_9.07.06_AM.png) #### What are the relevant issue numbers? Closes #23025 See merge request !6716
| * Change issue board defaultsAnnabel Dunstone Gray2016-10-061-4/+2
| |
* | Merge branch 'fix-already-selected-activity-link' into 'master' Fatih Acet2016-10-061-7/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inconsistent highlighting of already selected activity nav-links ## What does this MR do? * Remove edge case where user could deselect an activity nav-link (which seems to be returning all the events) * Explicitly add an `All` tab to return all the events ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Resolves existing UI inconsistency ## Screenshots (if relevant) Before: ![4OzkoQVJYc](/uploads/fd2a7fdbde2159e875482ec7b828fe60/4OzkoQVJYc.gif) After: ![E0lj8UhEUU](/uploads/7eb5155861eb79d72957de04c9f172c9/E0lj8UhEUU.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] 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) ## What are the relevant issue numbers? * Closes #21631 * Closes #21452 See merge request !6091
| * | Fix inconsistent highlighting of already selected activity nav-linksClement Ho2016-10-051-7/+5
| | |
* | | Merge branch 'update-profile-view' into 'master' Annabel Dunstone Gray2016-10-061-18/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update profile view ## What does this MR do? Centers entire profile information section ## Screenshots (if relevant) Before: ![Screen_Shot_2016-10-03_at_4.23.03_PM](/uploads/bc2017e88cb52ec0e817c4c59e70a186/Screen_Shot_2016-10-03_at_4.23.03_PM.png) After: ![Screen_Shot_2016-10-03_at_4.21.57_PM](/uploads/86ce1339d21cc39a64c22f27868a2986/Screen_Shot_2016-10-03_at_4.21.57_PM.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 https://gitlab.com/gitlab-org/gitlab-ce/issues/22829 cc @dzaporozhets See merge request !6662
| * | | spacing tweaksupdate-profile-viewtauriedavis2016-10-061-12/+1
| | | |
| * | | add spaces and fix handle stylestauriedavis2016-10-041-4/+8
| | | |
| * | | update profile viewtauriedavis2016-10-031-6/+2
| | | |
* | | | Merge branch 'dz-root-url' into 'master' Dmitriy Zaporozhets2016-10-062-10/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move user#show and group#show routing under root url ## What does this MR do? Changes routing so user#show and group#show routing is under root url ## Are there points in the code the reviewer needs to double check? no ## Why was this MR needed? For nice and consistent routing for user/group show pages: | before | after| |---|---| | `/u/dzaporozhets` | `/dzaporozhets`| | `/dzaporozhets/gitlab-ce` |`/dzaporozhets/gitlab-ce`| | `/u/dzaporozhets/snippets` |`/u/dzaporozhets/snippets`| | `/groups/gitlab-org`| `/gitlab-org`| | `/gitlab-org/gitlab-ce`| `/gitlab-org/gitlab-ce`| | `/groups/gitlab-org/issues `| `/groups/gitlab-org/issues `| So show page for user and group shown as `/:name` which is much nicer than before. At same time all nested pages like group issues stays under REST `/groups/:name/issues` so we don't need to introduce extra name restrictions ( ex. case when group has project with name "issues") ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [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 - [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? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3620 See merge request !6686
| * | | | Change user & group landing page routing from /u/:name & /groups/:name to /:nameDmitriy Zaporozhets2016-10-062-10/+5
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'replace-bootstrap-caret' into 'master' Jacob Schatz2016-10-067-33/+36
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace bootstrap caret with fontawesome caret ## What does this MR do? 1. Replaces all occurrences of `.caret` with fontawesome's caret (`fa-caret-down` for most cases) 2. Remove `.caret` from CSS 3. Refactored pipeline graph toggle to display the correct fontawesome caret (Had to change some JavaScript for this) ## Are there points in the code the reviewer needs to double check? * Need to check if I missed any pages :disappointed_relieved: or for any side effects ## Why was this MR needed? Resolves UI inconsistency ## Screenshots (if relevant) Before (1 example out of many): ![Screen_Shot_2016-09-12_at_3.49.58_PM](/uploads/5eb93bbcc00412a5875e39302f4d8ba0/Screen_Shot_2016-09-12_at_3.49.58_PM.png) After: ![Screen_Shot_2016-09-12_at_3.49.48_PM](/uploads/9259a9ebfb0bd09b4cfd55674e9b8be4/Screen_Shot_2016-09-12_at_3.49.48_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [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? Closes #21169 See merge request !6314
| * | | Replace bootstrap caret with fontawesome caretClement Ho2016-10-057-33/+36
| | | |
* | | | Merge branch 'issue-boards-new-issue' into 'master' Fatih Acet2016-10-067-5/+121
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue boards new issue form ## What does this MR do? Adds a new issue form into the issue boards lists. ## Screenshots (if relevant) ![Screen_Shot_2016-10-03_at_14.57.30](/uploads/17fe6cd37bd020a2ee1688e0b496c18f/Screen_Shot_2016-10-03_at_14.57.30.png) ![Screen_Shot_2016-10-03_at_14.57.32](/uploads/c3f12bcb9ff9a0e7ce5b0bb06dfb0dd7/Screen_Shot_2016-10-03_at_14.57.32.png) ## What are the relevant issue numbers? Part of #21219 See merge request !6653
| * | | | Remove the code finding an issue by undefinedPhil Hughes2016-10-061-2/+1
| | | | |
| * | | | Shows error if response returns an errorissue-boards-new-issuePhil Hughes2016-10-061-2/+19
| | | | | | | | | | | | | | | | | | | | Added validation so the user shouldnt be able to submit the form without the title present
| * | | | Fix form not re-enabling thanks to jQueryPhil Hughes2016-10-063-3/+7
| | | | | | | | | | | | | | | | | | | | Stop issue being dragged if it doesn't have an ID
| * | | | Made the CSS a bit more reasonablePhil Hughes2016-10-062-7/+3
| | | | | | | | | | | | | | | | | | | | Changed how the data is passed into Vue resource
| * | | | Moved form outside of listPhil Hughes2016-10-062-3/+11
| | | | | | | | | | | | | | | | | | | | This was causing issues with moving from the done list
| * | | | Fixed issue with backlog list not savingPhil Hughes2016-10-062-3/+4
| | | | | | | | | | | | | | | | | | | | Fixed issue when dragging cards
| * | | | Added ability to save the new issuePhil Hughes2016-10-065-3/+35
| | | | |
| * | | | Add new issue form to listsPhil Hughes2016-10-064-3/+62
| | | | | | | | | | | | | | | | | | | | Closes #21219
* | | | | MergeRequest new form load diff asynchronouslynew-merge-requests-commit-tab-activePaco Guzman2016-10-062-5/+23
|/ / / /
* | | | Fix CHANGELOG and wrong conflict resolutionRémy Coutable2016-10-061-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge commit 'dev/security' into 'master'Rémy Coutable2016-10-064-12/+14
|\ \ \ \ | |/ / / |/| | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Merge branch '22435-no-api-state-change-via-rails-session' into 'security' Douwe Maan2016-09-284-13/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: disable rails session auth for non-GET/HEAD requests Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22435 See merge request !1999
| | * | | Convert label creation from API to controller endpointNick Thomas2016-09-234-13/+15
| | | | |
* | | | | Merge branch 'flash-cherry-pick-error' into 'master' Fatih Acet2016-10-051-7/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent flash alert text from being obscured when container is fluid ## What does this MR do? Fixes [a regression](https://gitlab.com/gitlab-org/gitlab-ce/commit/a2af7790) that causes the text within server-initiated flash *alerts* (not flash *notices*) to be obscured when `.container-fluid` is applied. It was reported in relation to a cherry-picking flash alert, but the problem occurs with all server-initiated flash alerts contained by a fluid container. ## Are there points in the code the reviewer needs to double check? Note that as part of this fix, I combined some duplicate code and removed `.flash-text` & `.content-wrapper` selectors as they didn't seem to be necessary. I manually tested JS-initiated Flash alerts to make sure this doesn't affect their appearance. I also grepped around for anything else that might depend on these styles. Everything checked out. But... can *you* see something this is going to break? ## Why was this MR needed? Affected users can't read flash alerts. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-10-05_at_3.02.38_PM](/uploads/af258585e428d82dc2b293434661790b/Screen_Shot_2016-10-05_at_3.02.38_PM.png) After: ![Screen_Shot_2016-10-05_at_3.02.47_PM](/uploads/75a93235440e2b83088e66bbe53d6cee/Screen_Shot_2016-10-05_at_3.02.47_PM.png) JS-initiated flash alert (unaffected): ![Screen_Shot_2016-10-05_at_3.39.57_PM](/uploads/ba678cfaeb09c639499059712a33abe8/Screen_Shot_2016-10-05_at_3.39.57_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 - [] 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 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/22915 cc: @jschatz1 See merge request !6694
| * | | | Make flash-alert background transparent to match flash-notice.flash-cherry-pick-errorBryce Johnson2016-10-051-7/+2
| | | | |
* | | | | Merge branch 'revert-c676283b' into 'master' Fatih Acet2016-10-058-53/+150
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated issuable form with GL dropdowns ## What does this MR do? This adds back in the GL dropdowns into the issuable form but fixes a lot of usability issues & bugs. ## What are the relevant issue numbers? Closes #19879, #19882, #19881, #19883, #19880 ## Screenshots (if relevant) ![Screen_Shot_2016-08-30_at_12.13.09](/uploads/f1df758b3fb59958b4e6b62960b81bfb/Screen_Shot_2016-08-30_at_12.13.09.png) ![Screen_Shot_2016-08-30_at_12.13.13](/uploads/6e4fd8f4d874b14eaab6b10752a19df4/Screen_Shot_2016-08-30_at_12.13.13.png) See merge request !5293
| * | | | | Fix bad merge conflict resolution.Fatih Acet2016-10-051-2/+0
| | | | | |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Fatih Acet2016-10-051-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | revert-c676283b-existing
| * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵revert-c676283bFatih Acet2016-10-0525-906/+819
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revert-c676283b-existing # Conflicts: # app/assets/javascripts/dispatcher.js
| * \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Fatih Acet2016-10-051-0/+19
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | revert-c676283b-existing
| * | | | | | | Add position menu above ability to glDropdown.Fatih Acet2016-10-045-35/+37
| | | | | | | |
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Fatih Acet2016-10-047-30/+73
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | revert-c676283b-existing
| * | | | | | | | Tweak issuable dropdowns to open above the dropdown.Fatih Acet2016-10-041-0/+28
| | | | | | | | |
| * | | | | | | | Fix dropdown title when No Label selected.Fatih Acet2016-10-042-23/+41
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into revert-c676283bPhil Hughes2016-10-045-18/+52
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into revert-c676283bPhil Hughes2016-10-03134-704/+2053
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into revert-c676283bPhil Hughes2016-09-0228-157/+236
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed label toggle textPhil Hughes2016-08-301-14/+17
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into revert-c676283bPhil Hughes2016-08-30381-11049/+17329
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed up frontend code based on feedbackPhil Hughes2016-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated a test to be more specific about where the content is
| * | | | | | | | | | | Uses the selected values from the controller not the paramsPhil Hughes2016-07-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tests for new merge requests from forked project & owned project
| * | | | | | | | | | | Removes tick from no label when selecting a labelPhil Hughes2016-07-201-0/+6
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed 'no label' being in dropdown toggle labelPhil Hughes2016-07-201-6/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Remove unnecesary update.label eventAlfredo Sumaran2016-07-202-2/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed issuable sidebar label toggle not workingPhil Hughes2016-07-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed un-used JS var
| * | | | | | | | | | | Gets value from native element rather than converting to jquery elementPhil Hughes2016-07-201-1/+1
| | | | | | | | | | | |