summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Gracefully handle adding of no users to projects and groupsLinus G Thiel2016-10-241-2/+3
| | | | | | | | | | | | | | | | - Disable {project, group} members submit button if no users If no users are selected, the submit button should be disabled. - Alert user when no users were added to {project, group}. When no users were selected for adding, an alert message is flashed that no users were added. - Also, this commit adds a feedback when users were actually added to a project, in symmetry with how group members are handled. Closes #22967, #23270.
* removes extra line for empty milestone description23557-remove-extra-line-for-empty-issue-descriptionNur Rony2016-10-241-1/+1
|
* Merge branch 'master' into 23557-remove-extra-line-for-empty-issue-descriptionNur Rony2016-10-246-19/+79
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (22 commits) Fix status code expectation Stop clearing the database cache on rake cache:clear Fix error in generating labels Fix bug where e-mails were not being sent out via Sidekiq Fix documents and comments on Build API `scope`. #23146 #19131 Re-organize queues to use for Sidekiq Fix wrong endpoint in api/users documentation, fix same typo in spec describe blocks Update CHANGELOG Fix object data to be sent to fetch analytics data Fixed compare ellipsis messing with layout Change "Group#web_url" to return "/groups/twitter" rather than "/twitter". fix font weight of project feature settings Add hover to trash icon in notes Ensure custom provider tab labels don't break layout. Fixed issue when images are loading it would push off the tabs Fixed issues with sticky mr tabs & sidebar Refactor and add new functionality to CI yaml reference Ignore external issues when bulk assigning issues to author of merge request. Changed gitlab-shell version to avoid warning when precompiling the assets. Grammar fixes in docs ...
| * Merge branch 'ldap-login-styles' into 'master' Jacob Schatz2016-10-221-1/+33
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support LDAP login tabs wrapping to second line (and a few other login fixes) ## What does this MR do? Fixes some regressions introduced for customers with multiple servers configured for login and/or long label names. Also, improves styling for the login page on small screens. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? See the bad behavior here: https://gitlab.com/gitlab-org/gitlab-ce/issues/23435#note_17117893 ## Screenshots (if relevant) ![2016-10-19_16.34.00](/uploads/2816545b4db60ddb6430c458c2c41582/2016-10-19_16.34.00.gif) ![2016-10-19_18.07.26](/uploads/53340d5894db6441cc82b182fb47cf18/2016-10-19_18.07.26.gif) ## Does this MR meet the acceptance criteria? - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [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? https://gitlab.com/gitlab-org/gitlab-ce/issues/23435#note_17117677 See merge request !6993
| | * Ensure custom provider tab labels don't break layout.ldap-login-stylesBryce Johnson2016-10-201-1/+33
| | | | | | | | | | | | (Also fix some issues for session views on small screens.)
| * | Merge branch '22892-cycle-analytics-date-filter-is-not-working' into 'master' Fatih Acet2016-10-221-1/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Cycle analytics date filter is not working" Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22892 See merge request !6906
| | * | Fix object data to be sent to fetch analytics dataAlfredo Sumaran2016-10-211-1/+5
| | |/
| * | Merge branch 'project-settings--features-weight' into 'master' Annabel Dunstone Gray2016-10-211-2/+14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix font weight of project feature settings ## What does this MR do? Fixes font weight for project feature settings ## Screenshots (if relevant) Before: ![Screen_Shot_2016-10-14_at_9.49.06_AM](/uploads/76e1f91cd8f6fcf9197a51215b497e4a/Screen_Shot_2016-10-14_at_9.49.06_AM.png) After: ![Screen_Shot_2016-10-14_at_11.43.44_AM](/uploads/ecb378400d787c50dba2c3833bb72964/Screen_Shot_2016-10-14_at_11.43.44_AM.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 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? https://gitlab.com/gitlab-org/gitlab-ce/issues/19734#note_16964612 See merge request !6902
| | * | fix font weight of project feature settingsproject-settings--features-weighttauriedavis2016-10-201-2/+14
| | |/
| * | Fixed issue when images are loading it would push off the tabsfixed-mr-tabs-fixesPhil Hughes2016-10-201-2/+8
| | |
| * | Fixed issues with sticky mr tabs & sidebarPhil Hughes2016-10-203-13/+19
| |/ | | | | | | Closes #23504
* | removes extra line for empty issue descriptionNur Rony2016-10-211-0/+2
|/
* Create protected branches bundleAlfredo Sumaran2016-10-206-0/+1
|
* Merge branch '22089-show-full-job-name-on-hover-on-pipeline-graph' into ↵Annabel Dunstone Gray2016-10-201-4/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add tooltip with jobs full name to pipelines graph ## What does this MR do? This MR adds a tooltip to build items in the pipelines graph as some build names are truncated. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Some job names that are truncated need to be fully identified to avoid confusion. ## Screenshots (if relevant) [Latest screenies here!](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6403#note_16968703). ## 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 #22089 See merge request !6403
| * Added dyanmic position adjustment22089-show-full-job-name-on-hover-on-pipeline-graphLuke Bennett2016-10-192-15/+10
| | | | | | | | | | | | | | | | Added tooltips for dropdown items Reverted pretty much everything in favour of a DOM approach Simplified JS
| * Added tooltip with jobs full name to build items in graphLuke Bennett2016-10-181-0/+11
| | | | | | | | | | | | | | | | Added status to build tooltip and removed status icon tooltip Added Pipelines class to force tooltips ontop of the dropdown, we cannot do this with data attributes because dropdown toggle is already set Corrected dispatcher invocation
* | Change input order on Sign In form for better tabbing.unrevert-tab-order-MRClement Ho2016-10-201-0/+17
| | | | | | | | | | | | | | | | | | This *unreverts* 8751491b, which was mistakenly reverted in !6328. It also changes the implementation of the original commit to work with the new login styling and markup. cc: @ClemMakesApps
* | Merge branch 'boards-blank-state-size-fix' into 'master' Fatih Acet2016-10-201-2/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed height of issue board blank state ## What does this MR do? The height of the issue board blank state was causing some weird scrolling issues. This MR changes the height of the blank state. See merge request !6960
| * | Fixed height of issue board blank stateboards-blank-state-size-fixPhil Hughes2016-10-181-2/+1
| | |
* | | Merge branch '23346-pipeline-buttons-cutoff' into 'master' Fatih Acet2016-10-201-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Smaller min-width for MR pipeline table ## What does this MR do? Nests class under `.tab-pane` to make sure buttons don't get cut off ## Screenshots (if relevant) ![Screen_Shot_2016-10-14_at_11.00.02_AM](/uploads/6e19e0375721f2cb58223c2e7ed89308/Screen_Shot_2016-10-14_at_11.00.02_AM.png) ## What are the relevant issue numbers? Closes #23346 See merge request !6893
| * | | Smaller min-width for MR pipeline table23346-pipeline-buttons-cutoffAnnabel Dunstone Gray2016-10-171-0/+4
| | | |
* | | | Merge branch 'ios-tooltips' into 'master' Annabel Dunstone Gray2016-10-193-2/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set webkit-overflow-scrolling to auto for children of body. ## What does this MR do? Fixes weird tooltip layering behavior in iOS Safari. See screenshots and/or the original issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/22816 ## Why was this MR needed? Tooltips were cutoff in Safari. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-10-18_at_7.13.11_PM](/uploads/5558d60b7369a9355f18d34dcc2c179e/Screen_Shot_2016-10-18_at_7.13.11_PM.png) After: ![Screen_Shot_2016-10-18_at_7.13.40_PM](/uploads/ae07002f2f396f135b3078538d5c4ad6/Screen_Shot_2016-10-18_at_7.13.40_PM.png) Also, as part of this fix, I removed applications of `-webkit-overflow-scrolling: auto` in two other places where they're no longer needed. One was the file-holder. I made sure I could reproduce the behavior this was intended to fix, and then made sure this MR still fixed it. Here's the errant behavior: ![2016-10-18_19.00.22](/uploads/0bd3ee3bab44769dfce80c7edaac3248/2016-10-18_19.00.22.gif) Here's what it looks like with this MR: ![2016-10-18_19.00.49](/uploads/e405ded5acdbbbe5e577222c11198691/2016-10-18_19.00.49.gif) ## 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) - [ ] 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? See merge request !6962
| * | | | Set webkit-overflow-scrolling to auto for children of body.ios-tooltipsBryce Johnson2016-10-193-2/+12
| | | | |
* | | | | Merge branch '23375-filtering-on-any-label-or-no-label-does-not-work' into ↵Fatih Acet2016-10-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix 'No label' and 'Any label' filters ## What does this MR do? Returns the `title`as the `id` for `No label`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Label filters not working as expected ## Screenshots (if relevant) ![2016-10-19_04.58.08](/uploads/3b079bf28299c1155e0243171ac008f6/2016-10-19_04.58.08.gif) ## 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 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 #23375 See merge request !6974
| * | | | | Return the title for id of 'No label'23375-filtering-on-any-label-or-no-label-does-not-workLuke Bennett2016-10-191-1/+1
| | | | | |
* | | | | | Disable subscribing to group-level labelsDouglas Barbosa Alexandre2016-10-191-0/+7
| | | | | |
* | | | | | Add label type to group and project labels listsDouglas Barbosa Alexandre2016-10-191-1/+15
| | | | | |
* | | | | | Remove scopes/types for labelsDouglas Barbosa Alexandre2016-10-191-9/+1
| | | | | |
* | | | | | List group labels on project labels pageDouglas Barbosa Alexandre2016-10-191-1/+9
| | | | | |
* | | | | | Add CRUD for Group LabelsDouglas Barbosa Alexandre2016-10-191-0/+2
| |/ / / / |/| | | |
* | | | | Merge branch '22191-delete-dynamic-envs-mr' into 'master' Rémy Coutable2016-10-193-0/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete dynamic environments - Adds "close environment" action to a merge request - Adds tabs to environments list - Adds close button to each environment row in environments list - Replaces Destroy button with Close button inside an environment - Adds close button to builds list inside an environment #### Configuration In order to enable stopping environments a valid `.gitlab-ci.yml` syntax has to be used: ``` review: environment: name: review/$app on_stop: stop_review stop_review: script: echo Delete My App when: manual environment: name: review/$app action: stop ``` This MR requires that `stop_review` has to have: `when`, `environment:name` and `environment:action` defined. The next MR after this one will verify that and enforce that these settings are configured. It will also implicitly configure these settings, making it possible to define it like this: ``` review: environment: name: review/$app on_stop: stop_review stop_review: script: echo Delete My App ``` Closes #22191 See merge request !6669
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-182-59/+62
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-1815-433/+769
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2016-10-179-133/+193
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 22191-delete-dynamic-envs-mr
| * | | | | | Updates class name for consistencyFilipa Lacerda2016-10-173-5/+5
| | | | | | |
| * | | | | | Improve after code reviewKamil Trzcinski2016-10-171-1/+1
| | | | | | |
| * | | | | | Merge branch '22191-delete-dynamic-envs-mr' of ↵Kamil Trzcinski2016-10-171-0/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into 22191-delete-dynamic-envs-mr
| | * | | | | | Updates MR template to include stop linkFilipa Lacerda2016-10-171-0/+11
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-171-0/+13
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-17101-732/+2153
| |\ \ \ \ \ \ \
| * | | | | | | | Adds stop environment button to environments listFilipa Lacerda2016-10-061-0/+8
| | | | | | | | |
| * | | | | | | | Adds link to close environment in a merge requestFilipa Lacerda2016-10-061-0/+9
| | | | | | | | |
* | | | | | | | | Fix visual weirdness in pipelinesAnnabel Dunstone Gray2016-10-181-2/+1
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Fix missing semicolon to make scss-lint happyfix-scss-lint-pipelinesStan Hu2016-10-181-1/+1
| | | | | | | |
* | | | | | | | Merge branch '19991-triggered-pipeline' into 'master' Jacob Schatz2016-10-181-17/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Triggered pipelines #### What does this MR do? Separates trigger into its own column #### Screenshots (if relevant) ![Screen_Shot_2016-10-07_at_4.21.54_PM](/uploads/092e8205d329b66b34045fe17c5e6e4f/Screen_Shot_2016-10-07_at_4.21.54_PM.png) ![Screen_Shot_2016-10-17_at_9.13.10_AM](/uploads/7df90e0e2a07a9f282df3605787d3cc2/Screen_Shot_2016-10-17_at_9.13.10_AM.png) ![Screen_Shot_2016-10-17_at_9.15.07_AM](/uploads/b7dc0307c8549e72c3f812c3cd91833a/Screen_Shot_2016-10-17_at_9.15.07_AM.png) #### What are the relevant issue numbers? Closes #19991 See merge request !6753
| * | | | | | | | Add API as trigger19991-triggered-pipelineAnnabel Dunstone Gray2016-10-171-0/+4
| | | | | | | | |
| * | | | | | | | Trigger updatesAnnabel Dunstone Gray2016-10-101-2/+8
| | | | | | | | |
| * | | | | | | | Fix icon alignmentAnnabel Dunstone Gray2016-10-101-0/+5
| | | | | | | | |
| * | | | | | | | Add separate pipeline and commit columnsAnnabel Dunstone Gray2016-10-101-19/+9
| | | | | | | | |
* | | | | | | | | Require missing Vue dependencyAlfredo Sumaran2016-10-181-0/+2
| | | | | | | | |