summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Don't use params[:view] directly.param-viewDouwe Maan2015-11-176-9/+12
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-11-173-1/+29
|\
| * Merge branch 'issue/vars-need-eval' into 'master' Douwe Maan2015-11-171-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure variable in mail is evalled I received this snippet in the mail: ``` Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Project #{@old_path_with_namespace} was moved to another location The project is now located under ``` This MR fixes it. Notes: * I did a quick grep on other 'text.erb' files, but this was the only one with this type of error * I made no changes to the specs. The only [spec](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/spec/mailers/notify_spec.rb#L412) I could find passes because (I assume) the correct value is in the html-part See merge request !1706
| | * Ensure variable is evalledGert Goet2015-10-291-1/+1
| | |
| * | Merge branch 'rs-wiki-touches-project' into 'master' Douwe Maan2015-11-172-0/+28
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Make ProjectWiki touch Project#last_activity_at after wiki actions Closes #3026 See merge request !1803
| | * | Make ProjectWiki touch Project#last_activity_at after wiki actionsrs-wiki-touches-projectRobert Speicher2015-11-162-0/+28
| | | | | | | | | | | | | | | | Closes #3026
* | | | Merge pull request #9837 from Great-Antique/masterRobert Schilling2015-11-171-2/+2
|\ \ \ \ | |/ / / |/| | | Fix md syntax in doc/api/commits.md
| * | | Fix md syntax in doc/api/commits.mdDen Girnyk2015-11-171-2/+2
|/ / /
* | | Merge branch 'http-to-https' into 'master' Achilleas Pipinellis2015-11-1720-45/+45
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Rewrite HTTP links to force TLS, where possible I got annoyed at the fact that the links on the profile page don't force the use of TLS, so I grepped through the entire source tree, tested all the links I found, and replaced them if possible. See merge request !1806
| * | | Rewrite HTTP links to force TLS, where possibleAlex Jordan2015-11-1620-45/+45
| | | |
* | | | Merge branch 'global-milestones' into 'master' Dmitriy Zaporozhets2015-11-1637-258/+398
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create milestones in the group When you work with groups its quite often you want to create same milestone in multiple projects. This MR allows you to do so For #3488 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1797
| * | | | Some code and doc improvementsglobal-milestonesDmitriy Zaporozhets2015-11-164-6/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix removing avatar for groupDmitriy Zaporozhets2015-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Group masters should be able to create/close milestonesDmitriy Zaporozhets2015-11-165-7/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add milestones documentation to workflowDmitriy Zaporozhets2015-11-164-0/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Few changes to Group Milestone feature:Dmitriy Zaporozhets2015-11-164-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Group attachments are not supported so I removed attach file link * Added changelog item * Add markdown hint to project milestone form Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add header and page title to new milestone pageDmitriy Zaporozhets2015-11-161-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Lets add more tests to Milestones servicesDmitriy Zaporozhets2015-11-163-1/+52
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Move global milestone specsDmitriy Zaporozhets2015-11-163-96/+65
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix a bug when milestone/label filter was empty for dashboard issues pageDmitriy Zaporozhets2015-11-162-0/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Refactor global and group milestones logicDmitriy Zaporozhets2015-11-1619-165/+145
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Create milestones in the groupDmitriy Zaporozhets2015-11-167-10/+121
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'rs-rc1-docs' into 'master' Robert Speicher2015-11-163-19/+19
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 8.2.rc1 documentation updates [ci skip] See merge request !1798
| * | | | Reorder monthly release tasks for RC1 dayrs-rc1-docsRobert Speicher2015-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It didn't make sense to merge CE master into EE master, and *then* do the RC1 tasks (e.g., install/update docs) because then the RC1 won't have the updated docs.
| * | | | Update doc/update/8.1-to-8.2.mdRobert Speicher2015-11-131-6/+7
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Update doc/install/installation.md for gitlab-workhorseRobert Speicher2015-11-131-10/+9
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Update doc/install/installation.md for 8-2-stableRobert Speicher2015-11-131-2/+2
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'add_index_uniq' into 'master' Dmitriy Zaporozhets2015-11-162-4/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add index uniq Added unique on oid index. Removed the second index since it is unnecessary. See merge request !1810
| * | | | | Add unique to oid index for lfs object.add_index_uniqMarin Jankovski2015-11-162-3/+9
| | | | | |
| * | | | | unique is for indexes.Marin Jankovski2015-11-161-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'ci-runners-master-or-owner' into 'master' Dmitriy Zaporozhets2015-11-163-6/+22
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show specific runners from projects where user is master or owner This fix for permission escalation when handling specific runners. The users were allowed to assign runners from projects where they were guests. See merge request !1809
| * | | | Show specific runners from projects where user is master or ownerci-runners-master-or-ownerKamil Trzcinski2015-11-163-6/+22
| | | | |
* | | | | Merge branch 'refactor-duplication' into 'master' Dmitriy Zaporozhets2015-11-167-93/+46
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove some code duplication * remove duplicate code in uploaders * remove duplicate code in NotificationHelper * remove duplicate code in Repository Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1800
| * | | | | Fix wrong variable namerefactor-duplicationDmitriy Zaporozhets2015-11-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Remove duplicate code in Repository#*_names_containsDmitriy Zaporozhets2015-11-161-16/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Fix code duplication in NotificationsHelperDmitriy Zaporozhets2015-11-161-25/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Set less strict flay option for nowDmitriy Zaporozhets2015-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Remove duplicate methods in uploadersDmitriy Zaporozhets2015-11-164-51/+25
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'lfs' into 'master' Dmitriy Zaporozhets2015-11-1623-13/+1226
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Git LFS support Part of gitlab-org/gitlab-ce#2955 See merge request !1727
| * | | | Add support for git lfs.lfsMarin Jankovski2015-11-1623-13/+1226
|/ / / /
* | | | Merge branch 'test_env_cache' into 'master' Valery Sizov2015-11-162-9/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabling cache for test environment See merge request !1807
| * | | | Disabling cache for test environmentValery Sizov2015-11-162-9/+13
| | | | |
* | | | | Merge branch 'fix_trailing_title_space' of ↵Dmitriy Zaporozhets2015-11-163-2/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | https://gitlab.com/dblessing/gitlab-ce
| * | | | | Fix trailing space issue with merge requests and issues. Fixes #2514Drew Blessing2015-11-103-2/+7
| | | | | |
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-11-163-28/+21
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'rs-revert-gh-9812' into 'master' Valery Sizov2015-11-161-27/+19
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-provider" This reverts commit 84999611d8f7894219eb4ebc76555c79b1f14794, reversing changes made to 0d9fb211f3f842d10e1c57dcb9d3d42a9c11cd0b. See merge request !1805
| | * | | | Revert "Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-provider"rs-revert-gh-9812Robert Speicher2015-11-151-27/+19
| |/ / / / | | | | | | | | | | | | | | | | | | | | This reverts commit 84999611d8f7894219eb4ebc76555c79b1f14794, reversing changes made to 0d9fb211f3f842d10e1c57dcb9d3d42a9c11cd0b.
| * | | | Merge branch 'relative_links_default_branch' into 'master' Robert Speicher2015-11-152-1/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relative links in project README should point to default branch, not master Relative links in the README shown on a project's main page currently always point to the "master" branch. This is a particularly obvious problem for projects that have no "master" branch, since the link points to a non-existent file. This patch changes the relative links to instead point to the default branch. Resolves #2707, #1134, #1852 See merge request !1801
| | * | | | Relative links in the README file shown on the repository homepage should pointAlec Cooper2015-11-142-1/+2
| |/ / / / | | | | | | | | | | | | | | | to the default branch, not to master
* | | | | Merge branch 'releases-feature'Dmitriy Zaporozhets2015-11-1614-203/+362
|\ \ \ \ \ | |/ / / / |/| | | |