Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-11-04Load author dropdown using ajaxsearch-filters-redesignClement Ho
2016-11-04Add default dropdownClement Ho
2016-11-04Add initial dropdownClement Ho
2016-11-04Refactor tokenizerClement Ho
2016-11-03Remove original search formClement Ho
2016-11-03Add input focus highlightClement Ho
2016-11-03Prevent form search propagationClement Ho
2016-11-02Auto update input placeholder textClement Ho
2016-11-02Add droplabClement Ho
2016-11-02Add tokenization of regular textClement Ho
2016-11-02Vertically align filter iconClement Ho
2016-11-02Add filter/search barClement Ho
2016-11-01require rails/generators for generatorsYorick Peterse
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".
2016-11-01Merge branch '21633-permalink-to-collapsed-diff-line-does-not-work' into ↵Fatih Acet
'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
2016-11-01Merge branch '22889-remove-links-from-sidebar' into 'master' Fatih Acet
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
2016-11-01Merge branch 'background-migrations' into 'master'Robert Speicher
Support for post deployment migrations Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22133 See merge request !6572
2016-11-01Merge branch 'issue-boards-list-desciption-tooltip' into 'master' Fatih Acet
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
2016-11-01Merge branch 'project-activity-tabs-hide' into 'master' Fatih Acet
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
2016-11-01Merge branch '23641-remove-header-tooltips' into 'master' Fatih Acet
Remove tooltips from project header Closes #23641 See merge request !7211
2016-11-01Merge branch 'patch-7' into 'master' Patricio Cano
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
2016-11-01Update changelogAnnabel Dunstone Gray
2016-11-01Merge branch 'sh-init-sidekiq-queues' into 'master' Yorick Peterse
Initialize Sidekiq with the list of queues used by GitLab See merge request !7217
2016-11-01Remove tooltips from project headerAnnabel Dunstone Gray
2016-11-01Merge branch '22448-fix-500-nonexisting-branch' into 'master' Sean McGivern
Add validation errors to Merge Request form Closes #22448 See merge request !7163
2016-11-01Merge branch 'Allow-admin-to-search-for-user-by-secondary-email-address' ↵Sean McGivern
into 'master' Allow admin to search for user by secondary email address Closes #23761 See merge request !7115
2016-11-01Fix spinach testsAnnabel Dunstone Gray
2016-11-01Update links in side nav and headerAnnabel Dunstone Gray
2016-11-01Merge branch 'todos-empty-state' into 'master' Fatih Acet
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
2016-11-01Merge branch 'decaffeinate-the-docs' into 'master' Fatih Acet
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
2016-11-01Allow to search for user by secondary email address in the admin interfaceYar
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.
2016-11-01Rename :name search parameter to :search_query at /admin/usersYar
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
2016-11-01Merge branch 'issue_23242' into 'master' Sean McGivern
Fix project features default values closes #23242 See merge request !7181
2016-11-01Merge branch '23918-reaction-button-style' into 'master' Annabel Dunstone Gray
Correct padding and alignment for reaction buttons ## What does this MR do? Fixes padding and alignment for reaction buttons on issues. ## Screenshots (if relevant) ### Before ![img](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ae788883aca84799fca9cd23f8e16f28/image.png) ![img](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b2f5aa45dbb4899f054f839bd9046bb6/image.png) ### After ![Screen_Shot_2016-10-28_at_3.56.03_PM](/uploads/0b1affed448f6ec24fa56e7800daf753/Screen_Shot_2016-10-28_at_3.56.03_PM.png) ![Screen_Shot_2016-10-28_at_3.56.09_PM](/uploads/311bb59dc6eea8cd124232ebe647b5ef/Screen_Shot_2016-10-28_at_3.56.09_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 #23918 See merge request !7182
2016-11-01Merge branch 'adam-fix-wiki-links-markdown' into 'master' Sean McGivern
Fix relative links in Markdown wiki when displayed in "Project" tab Refers to #23806 See merge request !7218
2016-11-01Initialize Sidekiq with the list of queues used by GitLabStan Hu
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
2016-11-01Merge branch 'refactor_group_members' into 'master' Sean McGivern
Implement CreateProjectMembers service to make controller thin Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23566 See merge request !7170
2016-11-01Fix project features default valuesFelipe Artur
2016-11-01Merge branch 'add-link-to-issue-boards-in-api-readme' into 'master' Achilleas Pipinellis
Add a link to the Issue Boards API in main README See merge request !7221
2016-11-01Add a link to the Issue Boards API in main READMEAchilleas Pipinellis
[ci skip]
2016-11-01Merge branch 'blacklist-osl' into 'master' Robert Speicher
Blacklist the OSL 3.0 license See merge request !7171
2016-11-01Merge branch 'active-element-tooltip' into 'master' Fatih Acet
Do not show tooltip for active element ## What does this MR do? Change Bootstrap's default for tooltips to display them only when hovering and not for the active element. See also here: https://getbootstrap.com/javascript/#tooltips-options ## Screenshots ### Before ![before](/uploads/c5b7bd9eba07ca61bfa5ba014d08dd1a/before.webm) ### After ![after](/uploads/d8c4a69e5a6797d8d26ab92cb96fcb2d/after.webm) ## What are the relevant issue numbers? Closes #23794 See merge request !7105
2016-11-01Add validation errors to Merge Request formAlex Sanford
If source branch or target branch doesn't exist in the project, display form validation errors. Previously, this caused a 500 error code.
2016-11-01Merge branch 'panjan/gitlab-ce-reference_links_styling' into 'master' Sean McGivern
Fix Markdown styling inside reference links Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18096. Based off https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6609. See merge request !7169
2016-11-01Merge branch 'api-projects-fix-mdlink' into 'master' Sean McGivern
Fix project visibility level link Fix wrong syntax for link generation. See merge request !7201
2016-11-01Merge branch 'patch-9' into 'master' Sean McGivern
Update tags.md See merge request !7202
2016-11-01Fix Markdown styling inside reference linkspanjan
Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/18096
2016-11-01Fix relative links in Markdown wiki when displayed in "Project" tabAdam Niedzielski
Refers to #23806.
2016-11-01Adds label description to issue board titlePhil Hughes
Closes #22710
2016-11-01Merge branch 'optimize/labels-finder' into 'master' Sean McGivern
Optimize group labels page Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23684 Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/1148 See merge request !7123
2016-11-01Flexbox webkit prefixesPhil Hughes