summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* GitLab 8.13 not 13mrchrisw/gitlab-version-fixChris Wilson2016-11-021-2/+2
|
* Merge branch 'fix-changelog-md' into 'master' Alfredo Sumaran2016-11-021-46/+0
|\ | | | | | | | | | | | | Remove invalid changelog entries Fixes current CHANGELOG.md in master See merge request !7231
| * Remove invalid changelog entriesAlfredo Sumaran2016-11-021-46/+0
|/
* Merge branch '23053-ci-tables-pagination' into 'master' Alfredo Sumaran2016-11-024-3/+66
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Tables pagination is not responsive" ## What does this MR do? Makes table pagination responsive. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Table pagination was not responsive and was broken in smaller screens ## Screenshots (if relevant) ### Small screen ![small](/uploads/912c6813596ef9f992b3bf5a9ba141f1/small.png) ![small_big_numbers](/uploads/5add4c2ead1bd3fbf9f15f66e2dad178/small_big_numbers.png) ### Medium screen ![medium](/uploads/77774be45d83ad9bba127d0e020e2d48/medium.png) ### Large screen ![big](/uploads/ea30d115e7e2b915626faafa425687f6/big.png) ## 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 - [ ] 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 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 #23053 See merge request !7157
| * Adds variable.23053-ci-tables-paginationFilipa Lacerda2016-11-012-35/+2
| | | | | | | | Fixes changelog
| * Fixes after reviewFilipa Lacerda2016-11-011-2/+21
| |
| * Makes table pagination responsiveFilipa Lacerda2016-11-014-3/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Media queries for medium screens Adds entry to CHANGELOG Rollback to previous design Adds class for previous sibling Fix removed class Fixes after review Fix scss linter
* | Merge branch '23273-retry-build-btn' into 'master' Alfredo Sumaran2016-11-025-18/+44
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Improve build "Retry" button on Build Page" * On desktop, adds retry button on build page header * On mobile, adds retry button in sidebar ![Screen_Shot_2016-10-28_at_1.35.07_PM](/uploads/2f9f87a9fc3e85c9aafc8c3d7a231639/Screen_Shot_2016-10-28_at_1.35.07_PM.png) ![Screen_Shot_2016-10-26_at_1.01.44_PM](/uploads/d02ce3a422a505b14ab357f695de8bba/Screen_Shot_2016-10-26_at_1.01.44_PM.png) Closes #23273 See merge request !7126
| * | Change retry button color23273-retry-build-btnAnnabel Dunstone Gray2016-10-282-2/+6
| | |
| * | Fix failing builds_specAnnabel Dunstone Gray2016-10-271-1/+3
| | |
| * | Rename retry link and update changelogAnnabel Dunstone Gray2016-10-263-2/+3
| | |
| * | Align header items; put retry button back in sidebar on mobileAnnabel Dunstone Gray2016-10-263-17/+44
| | |
| * | Add retry build button in page header, remove from sidebarAnnabel Dunstone Gray2016-10-263-10/+2
| | |
* | | Merge branch '23545-distorted-images' into 'master' Annabel Dunstone Gray2016-11-0115-43/+77
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23545 Fix distorted project and group avatars ## What does this MR do? Wraps project and group avatars in image container to prevent distortion ## Are there points in the code the reviewer needs to double check? - Group/project lists - Group/project pages - Group/project admin pages - Group/project edit pages ## Screenshots (if relevant) ### Before ![Screen_Shot_2016-10-31_at_12.35.42_PM](/uploads/abaeef7ded89abbba7e08be686c9a609/Screen_Shot_2016-10-31_at_12.35.42_PM.png) ### After ![Screen_Shot_2016-10-31_at_12.35.28_PM](/uploads/cafe1b096cf66afde7f346e5610bf3f3/Screen_Shot_2016-10-31_at_12.35.28_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [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 - [ ] 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 #23545 See merge request !7206
| * | | Fix haml_lint23545-distorted-imagesAnnabel Dunstone Gray2016-11-011-2/+2
| | | |
| * | | 23545 Fix distorted project and group avatarstauriedavis2016-11-0115-43/+77
| | | |
* | | | require rails/generators for generatorsYorick Peterse2016-11-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Because this code resides in lib/ it may be eager loaded. Rails in turn doesn't define Rails::Generators by default unless you explicitly require "rails/generators".
* | | | Merge branch '21633-permalink-to-collapsed-diff-line-does-not-work' into ↵Fatih Acet2016-11-012-9/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fixed anchoring diff lines in collapsed diffs ## What does this MR do? This MR adds the ability to `forceLoad` a collapsed diff from instantiation, on top of this, if it is force loaded, we can pass a callback function to be invoked when the content is loaded. Now when a MR is loaded, we check for a diff line anchor that is currently within a collapsed diff, we re-instantiate the `singleFileDiff` with the `forceLoad` option. We also pass a callback function that in responsible for highlighting and scrolling to the specified anchor. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? We currently cannot anchor link to collapsed diff lines as the do not auto-expand. ## Screenshots (if relevant) https://youtu.be/fZVLlP6kchw ## 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 #21633 See merge request !6285
| * | | | Added forceLoad ability to singleFileDiffs, added callback to ↵21633-permalink-to-collapsed-diff-line-does-not-workLuke Bennett2016-10-212-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getContentHTML, added conditional force load if a collapsed diff line anchor is found Use url utility to retrieve hash
* | | | | Merge branch '22889-remove-links-from-sidebar' into 'master' Fatih Acet2016-11-019-105/+106
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update links in side nav and header * Remove todos, help, and project settings from sidebar * Remove plus icon from top right header * Put help link in user dropdown * Add lighter bg-color at the top of side nav ![Screen_Shot_2016-10-27_at_3.42.55_PM](/uploads/d81f3135b1af1e580d62451ae83b3435/Screen_Shot_2016-10-27_at_3.42.55_PM.png) Closes #22889 See merge request !7161
| * | | | | Update changelog22889-remove-links-from-sidebarAnnabel Dunstone Gray2016-11-011-0/+1
| | | | | |
| * | | | | Fix spinach testsAnnabel Dunstone Gray2016-11-013-13/+8
| | | | | |
| * | | | | Update links in side nav and headerAnnabel Dunstone Gray2016-11-015-92/+97
| | |/ / / | |/| | |
* | | | | Merge branch 'background-migrations' into 'master'Robert Speicher2016-11-017-0/+168
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for post deployment migrations Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22133 See merge request !6572
| * | | | | Support for post deployment migrationsbackground-migrationsYorick Peterse2016-10-317-0/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are regular Rails migrations that are executed by default. A user can opt-out of these migrations by setting an environment variable during the deployment process. Fixes gitlab-org/gitlab-ce#22133
* | | | | | Merge branch 'issue-boards-list-desciption-tooltip' into 'master' Fatih Acet2016-11-014-3/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds label description to issue board title ## What does this MR do? Adds the label description as a tooltip the issue board title. Tooltip is not visible on the backlog or done list. ## Screenshots (if relevant) ![tooltip-title](/uploads/e807a7ff6c48ac2181c4d4e86adf0f77/tooltip-title.gif) ## What are the relevant issue numbers? Closes #22710 See merge request !6743
| * | | | | | Adds label description to issue board titleissue-boards-list-desciption-tooltipPhil Hughes2016-11-014-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #22710
* | | | | | | Merge branch 'project-activity-tabs-hide' into 'master' Fatih Acet2016-11-014-3/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide project activity tabs when features are disabled ## What does this MR do? When features are disabled in project settings, the activity tabs are now correctly hidden. ## Screenshots (if relevant) ![Screen_Shot_2016-10-21_at_12.15.27](/uploads/3d85c027aa05487001c8abd624a99be0/Screen_Shot_2016-10-21_at_12.15.27.png) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/19734#note_17224181 See merge request !7038
| * | | | | | | Correctly passes feature key into feature_available methodproject-activity-tabs-hidePhil Hughes2016-11-012-36/+3
| | | | | | | |
| * | | | | | | Removed return statement that isn't neededPhil Hughes2016-11-011-1/+1
| | | | | | | |
| * | | | | | | Hide project activity tabs when features are disabledPhil Hughes2016-11-014-3/+64
| | | | | | | |
* | | | | | | | Merge branch '23641-remove-header-tooltips' into 'master' Fatih Acet2016-11-013-5/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove tooltips from project header Closes #23641 See merge request !7211
| * | | | | | | | Remove tooltips from project header23641-remove-header-tooltipsAnnabel Dunstone Gray2016-11-013-5/+3
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'patch-7' into 'master' Patricio Cano2016-11-011-7/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix how to get SAML error details ## What does this MR do? Update to better document how to get SAML error details. Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/1929 and https://gitlab.com/gitlab-org/gitlab-ce/issues/3223. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/12705. See merge request !7199
| * | | | | | | | fix how to get SAML error detailsBen Bodenmiller2016-10-311-7/+14
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'sh-init-sidekiq-queues' into 'master' Yorick Peterse2016-11-012-0/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize Sidekiq with the list of queues used by GitLab See merge request !7217
| * | | | | | | | Initialize Sidekiq with the list of queues used by GitLabsh-init-sidekiq-queuesStan Hu2016-11-012-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Sidekiq client API adds an entry to the Sidekiq "queues" list, but mail_room and gitlab-shell use redis-rb directly to insert jobs into Redis and thus do not make an extra "sadd" call to Redis each time a job is inserted. To make it possible to monitor these queues via the API, add an initialization step to set up the list at startup. Closes gitlab-com/infrastructure#682
* | | | | | | | | Merge branch '22448-fix-500-nonexisting-branch' into 'master' Sean McGivern2016-11-014-16/+92
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add validation errors to Merge Request form Closes #22448 See merge request !7163
| * | | | | | | | Add validation errors to Merge Request formAlex Sanford2016-11-014-16/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If source branch or target branch doesn't exist in the project, display form validation errors. Previously, this caused a 500 error code.
* | | | | | | | | Merge branch 'Allow-admin-to-search-for-user-by-secondary-email-address' ↵Sean McGivern2016-11-015-2/+96
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Allow admin to search for user by secondary email address Closes #23761 See merge request !7115
| * | | | | | | | | Allow to search for user by secondary email address in the admin interfaceYar2016-11-014-1/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not possible to search for a user by his secondary email address in the Users search bar in the admin interface(/admin/users). A use-case could be that an admin wants to remove a specific secondary email address of an user, because it interferes with another user. Issue #23761 This commit adds ability to search not only by main email, but also by any secondary email in the admin interface.
| * | | | | | | | | Rename :name search parameter to :search_query at /admin/usersYar2016-11-013-2/+3
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parameter is used to search users by several criretia was called :name. This request renames it to :search_query which closer to it actual perpose
* | | | | | | | | Merge branch 'todos-empty-state' into 'master' Fatih Acet2016-11-016-65/+262
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New todos blank state ## What does this MR do? Updates the blank state on todos. ### Blank state when user has previously had todos ![Screen_Shot_2016-10-12_at_12.40.35](/uploads/17d9a5a409d12bce73147e3879d9d62d/Screen_Shot_2016-10-12_at_12.40.35.png) ### Fully empty blank state ![Screen_Shot_2016-10-12_at_12.40.40](/uploads/5c0824096ced9f03b3ea5f892b70b08b/Screen_Shot_2016-10-12_at_12.40.40.png) ## What are the relevant issue numbers? Closes #20833 See merge request !6823
| * | | | | | | | Flexbox webkit prefixestodos-empty-statePhil Hughes2016-11-012-103/+5
| | | | | | | | |
| * | | | | | | | Tests updatePhil Hughes2016-11-011-1/+1
| | | | | | | | |
| * | | | | | | | Tests updatePhil Hughes2016-11-011-5/+5
| | | | | | | | |
| * | | | | | | | Changed where merge request link isPhil Hughes2016-11-011-1/+2
| | | | | | | | |
| * | | | | | | | New todos blank statePhil Hughes2016-11-015-61/+355
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Closes #20833
* | | | | | | | Merge branch 'decaffeinate-the-docs' into 'master' Fatih Acet2016-11-016-10/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove leftover references to coffeescript from comments and docs. I was looking at the front-end helper spec and noticed some outdated coffeescript refs in it. So I figured it wouldn't hurt to take a few minutes and remove all the coffeescript references in CE that we don't need anymore. I didn't touch any coffeescript references that could potentially break anything. Just docs and code comments. - [x] All builds are passing See merge request !7151
| * | | | | | | | Remove leftover references to coffeescript from comments and docs.decaffeinate-the-docsBryce Johnson2016-10-316-10/+8
| | |_|_|_|/ / / | |/| | | | | |