delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Cache only apt and ruby from vendorcache-apt-and-ruby-only	Kamil Trzcinski	2016-06-12	2	-3/+4
\| \| \| \| \|	Since introduction of gitignore the vendor folder contains also gitignores which affects detection when to update a cache. We explicitly cache only apt and ruby folders.
*	Merge branch 'fix-closes-issues-error-500' into 'master'	Robert Speicher	2016-06-12	6	-2/+42
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix Error 500 when using closes_issues API with an external issue tracker Closes #18484 See merge request !4608
\| *	Fix Error 500 when using closes_issues API with an external issue tracker	Stan Hu	2016-06-11	6	-2/+42
\| \| \| \| \| \| \| \|	Closes #18484
* \|	Merge branch 'nav-offscreen-dz-patch' into 'master'	Dmitriy Zaporozhets	2016-06-11	5	-27/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improvements to offscreen navigation Improvements on top of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4579 based on mockups from https://gitlab.com/gitlab-org/gitlab-ce/issues/18417#note_12389766 See merge request !4607
\| * \|	Center layout navigation and remove iconsnav-offscreen-dz-patch	Dmitriy Zaporozhets	2016-06-11	5	-27/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch '18417-nav-offscreen' into 'master'	Dmitriy Zaporozhets	2016-06-11	18	-182/+130
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Hide Left sidebar paradigm" ## What does this MR do? Hides the nav bar by default & centers the tanuki logo in the top nav ## Why was this MR needed? UX ## What are the relevant issue numbers? Closes #18417 ## Screenshots (if relevant) ![Screen_Shot_2016-06-10_at_12.49.10_PM](/uploads/c281e4c9de1c1bc9af59ebfa8d2bd18b/Screen_Shot_2016-06-10_at_12.49.10_PM.png) ![Screen_Shot_2016-06-10_at_12.49.27_PM](/uploads/635e0a88230105faa5527f6632899ddb/Screen_Shot_2016-06-10_at_12.49.27_PM.png) <img src="/uploads/3001a9c723037012f1b86cfacfb1225e/Screen_Shot_2016-06-10_at_12.51.41_PM.png" width="500px"> See merge request !4579
\| * \|	Fix preferences_spec test18417-nav-offscreen	Annabel Dunstone	2016-06-10	3	-8/+6
\| \| \|
\| * \|	Add back sidebar counters and username	Annabel Dunstone	2016-06-10	9	-15/+33
\| \| \|
\| * \|	Fix safari logo loading animation safari bug	Annabel Dunstone	2016-06-10	2	-8/+1
\| \| \|
\| * \|	Revert side nav to full width; remove border under nav; remove tooltips on ↵	Annabel Dunstone	2016-06-10	12	-145/+52
\| \| \| \| \| \| \| \| \| \| \| \|	nav links; stop page content shifting with side nav; put project nav in container
\| * \|	Update media queries	Annabel Dunstone	2016-06-10	1	-3/+3
\| \| \|
\| * \|	Fix profile test	Annabel Dunstone	2016-06-10	2	-1/+2
\| \| \|
\| * \|	Fix logo at all screen widths, update sidebar text	Annabel Dunstone	2016-06-10	7	-56/+78
\| \| \|
\| * \|	Move tanuki icon to center of nav bar; keep nav closed by default; remove ↵	Annabel Dunstone	2016-06-10	8	-36/+44
\| \| \| \| \| \| \| \| \| \| \| \|	collapsed nav cookie
* \| \|	Merge branch '18463-search-form-padding-is-too-damn-high' into 'master'	Dmitriy Zaporozhets	2016-06-11	1	-1/+0
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed search form padding ## What does this MR do? Corrects the padding of the search form. ## Are there points in the code the reviewer needs to double check? Ney. ## Why was this MR needed? UX ## What are the relevant issue numbers? Closes #18463. ## Screenshots (if relevant) ![Screen_Shot_2016-06-10_at_14.07.32](/uploads/e4d127c66cf7fa3286279367d6e4ea7c/Screen_Shot_2016-06-10_at_14.07.32.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 - [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 !4591
\| * \|	Fixed search form padding	Luke "Jared" Bennett	2016-06-10	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated CHANGELOG Removed CHANGELOG entry
* \| \|	Merge branch 'create-backup-dir-for-local' into 'master'	Robert Speicher	2016-06-10	1	-3/+18
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only create the backup directory if it is local Closes #12710 See merge request !4551
\| * \| \|	Only create the backup directory if it is local	Stan Hu	2016-06-10	1	-3/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #12710
* \| \| \|	Merge branch 'finding-multiple-projects-by-paths' into 'master'	Robert Speicher	2016-06-10	2	-11/+93
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Project.where_paths_in In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4410 I'm working on reducing the SQL queries needed to render Markdown. One reason for the large amount of queries is executing a large number of queries needed to find projects and related data. Basically `Project.find_with_namespace` is called in a loop and then any relations have to be retrieved separately. By using `Project.where_paths_in` we can work around this by doing something like: ```ruby project_paths = [...] # populated by some method projects = Project.where_paths_in(project_paths).includes(:namespace, ...) ``` Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/18042 See merge request !4535
\| * \| \|	Add Project.where_paths_infinding-multiple-projects-by-paths	Yorick Peterse	2016-06-10	2	-11/+93
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This method can be used to find multiple projects for multiple paths. For example, take this snippet: Project.where_paths_in(%w{gitlab-org/gitlab-ce gitlab-org/gitlab-ee}) This will return an ActiveRecord::Relation containing the GitLab CE and GitLab EE projects. This method takes care of matching rows both case-sensitively and case-insensitively where needed. Project.find_with_namespace in turn has been modified to use Project.where_paths_in without nuking any scoping (instead it uses reorder(nil)). This means that any default scopes (e.g. those used for "pending_delete" stay intact). The method Project.where_paths_in was added so the various Markdown filters can use a single query to grab all the projects referenced in a set of documents, something Project.find_with_namespace didn't allow.
* \| \| \|	Merge branch 'changelog-search-arrow-keys' into 'master'	Robert Speicher	2016-06-10	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changelog fix for search dropdown arrow keys fix [ci skip] See merge request !4580
\| * \| \| \|	Changelog fix for search dropdown arrow keys fixchangelog-search-arrow-keys	Phil Hughes	2016-06-10	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch '18462-remove-unused-mergerequest-gitlab_merge_status-method' ↵	Robert Speicher	2016-06-10	1	-8/+0
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Remove unused MergeRequest#gitlab_merge_status method Closes #18462. See merge request !4593
\| * \| \| \|	Remove unused MergeRequest#gitlab_merge_status method	Rémy Coutable	2016-06-10	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'labels-placement' into 'master'	Dmitriy Zaporozhets	2016-06-10	11	-105/+127
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move Labels and Milestones as sub tab to Issues/MR ## What does this MR do? UI/UX change. Moves project labels and milestone tabs under Issues and Merge request tabs. ## Why was this MR needed? To solve problem of having to many tabs in top navigation. Since Labels and Milestones depends on Issue/MR feature it belongs to it and can be removed from top nav. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18368 ## 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) - not needed - [x] API support added - not needed - [x] Tests - [x] Added for this feature/bug - changed existing tests to match new behaviour - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) cc @jschatz1 @annabeldunstone @skyruler See merge request !4592
\| * \| \| \|	Add CHANGELOG item for labels/milestones navigation change	Dmitriy Zaporozhets	2016-06-10	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Render issues link on issues subnav unless you visit merge request controller	Dmitriy Zaporozhets	2016-06-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Render only issues/mr in subnav depends on context	Dmitriy Zaporozhets	2016-06-10	5	-17/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Move Labels and Milestones as sub tab to Issues/MR	Dmitriy Zaporozhets	2016-06-10	7	-90/+107
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'workhorse-helpers' into 'master'	Robert Speicher	2016-06-10	14	-34/+61
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add workhorse controller and API helpers Adds `send_git_blob` and `send_git_archive` controller and API helpers to reduce duplication and make Workhorse easier for a developer to work with. See merge request !4486
\| * \| \| \|	Satisfy Rubocopworkhorse-helpers	Douwe Maan	2016-06-10	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' into workhorse-helpers	Douwe Maan	2016-06-10	175	-950/+2237
\| \|\ \ \ \ \| \| \|/ / /
\| * \| \| \|	Add send_git_diff helper	Douwe Maan	2016-06-08	231	-2052/+5316
\| \|\ \ \ \
\| * \| \| \| \|	Move changelog item	Douwe Maan	2016-06-06	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Add changelog item	Douwe Maan	2016-06-06	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Add workhorse controller and API helpers	Douwe Maan	2016-06-06	12	-24/+45
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'ci-page-ui-update' into 'master'	Jacob Schatz	2016-06-10	16	-247/+305
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CI build page UI update Closes #2569 See merge request !3829
\| * \| \| \| \|	Updated testsci-page-ui-update	Phil Hughes	2016-06-10	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed merge conflict that caused tests to fail with build	Phil Hughes	2016-06-10	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed failing tests	Phil Hughes	2016-06-10	1	-2/+4
\| \| \| \| \| \|
\| * \| \| \| \|	CI build page UI update	Phil Hughes	2016-06-10	16	-250/+306
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added sidebar Removed elements not present in design
* \| \| \| \| \|	Merge branch 'icon-color-fix' into 'master'	Jacob Schatz	2016-06-10	2	-8/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update activity SVG path ## What does this MR do? Fixes SVG path so the activity icon is the correct color ## Screenshots (if relevant) <img src="/uploads/ea948338ea816890851a8011b8b3255f/Screen_Shot_2016-06-09_at_8.43.05_AM.png" width="600px"> See merge request !4563
\| * \| \| \| \| \|	Update activity SVG pathicon-color-fix	Annabel Dunstone	2016-06-09	2	-8/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'prettier-awardable-button-active' into 'master'	Jacob Schatz	2016-06-10	1	-1/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Made the awardable buttons prettier when active ## What does this MR do? Made the active and hover state of the award emoji buttons prettier. ## Why was this MR needed? 'cause @JobV wanted them to look nicer :wink: ## What are the relevant issue numbers? Closes #18379 ## Screenshots (if relevant) ![Screen_Shot_2016-06-09_at_09.10.44](/uploads/5ecd0f12679e3484de1ab1d2dbe50cd8/Screen_Shot_2016-06-09_at_09.10.44.png) See merge request !4554
\| * \| \| \| \| \| \|	Made the awardable buttons prettier when activeprettier-awardable-button-active	Phil Hughes	2016-06-10	1	-1/+9
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #18379
* \| \| \| \| \| \|	Merge branch 'label-create-error-messages' into 'master'	Jacob Schatz	2016-06-10	1	-1/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly shows label errors in dropdown ## What does this MR do? Correctly shows any errors in the dropdown when creating a new label ## What are the relevant issue numbers? Closes #18344 ## Screenshots (if relevant) ![Screen_Shot_2016-06-09_at_09.01.59](/uploads/58dc56b39db20a50adce6f12510025fc/Screen_Shot_2016-06-09_at_09.01.59.png) See merge request !4553
\| * \| \| \| \| \| \|	Correctly shows label errors in dropdownlabel-create-error-messages	Phil Hughes	2016-06-10	1	-1/+4
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #18344
* \| \| \| \| \| \|	Merge branch 'user-search-dropdown' into 'master'	Jacob Schatz	2016-06-10	2	-40/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert change to search all users ## What does this MR do? Reverts a change that allowed the user to search for all users in the author/assignee dropdown ## Are there points in the code the reviewer needs to double check? Double check it isn't still searching all users See merge request !4564
\| * \| \| \| \| \| \|	removed tests needed for any author :poop:user-search-dropdown	Phil Hughes	2016-06-10	1	-36/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Revert change to search all users	Phil Hughes	2016-06-10	1	-4/+4
\| \|/ / / / / /