summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Don't use params[:view] directly.param-viewDouwe Maan2015-11-176-9/+12
* Merge branch 'issue/vars-need-eval' into 'master' Douwe Maan2015-11-171-1/+1
|\
| * Ensure variable is evalledGert Goet2015-10-291-1/+1
* | Merge branch 'rs-wiki-touches-project' into 'master' Douwe Maan2015-11-171-0/+10
|\ \
| * | Make ProjectWiki touch Project#last_activity_at after wiki actionsrs-wiki-touches-projectRobert Speicher2015-11-161-0/+10
* | | Merge branch 'http-to-https' into 'master' Achilleas Pipinellis2015-11-172-4/+4
|\ \ \
| * | | Rewrite HTTP links to force TLS, where possibleAlex Jordan2015-11-162-4/+4
* | | | Merge branch 'global-milestones' into 'master' Dmitriy Zaporozhets2015-11-1624-186/+230
|\ \ \ \ | |_|/ / |/| | |
| * | | Some code and doc improvementsglobal-milestonesDmitriy Zaporozhets2015-11-163-2/+6
| * | | Fix removing avatar for groupDmitriy Zaporozhets2015-11-161-1/+1
| * | | Group masters should be able to create/close milestonesDmitriy Zaporozhets2015-11-165-7/+9
| * | | Few changes to Group Milestone feature:Dmitriy Zaporozhets2015-11-163-6/+5
| * | | Add header and page title to new milestone pageDmitriy Zaporozhets2015-11-161-0/+3
| * | | Lets add more tests to Milestones servicesDmitriy Zaporozhets2015-11-161-1/+0
| * | | Move global milestone specsDmitriy Zaporozhets2015-11-161-26/+0
| * | | Fix a bug when milestone/label filter was empty for dashboard issues pageDmitriy Zaporozhets2015-11-161-0/+5
| * | | Refactor global and group milestones logicDmitriy Zaporozhets2015-11-1619-165/+145
| * | | Create milestones in the groupDmitriy Zaporozhets2015-11-163-8/+86
* | | | Merge branch 'ci-runners-master-or-owner' into 'master' Dmitriy Zaporozhets2015-11-161-5/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Show specific runners from projects where user is master or ownerci-runners-master-or-ownerKamil Trzcinski2015-11-161-5/+10
* | | | Merge branch 'refactor-duplication' into 'master' Dmitriy Zaporozhets2015-11-166-92/+45
|\ \ \ \
| * | | | Fix wrong variable namerefactor-duplicationDmitriy Zaporozhets2015-11-161-2/+2
| * | | | Remove duplicate code in Repository#*_names_containsDmitriy Zaporozhets2015-11-161-16/+7
| * | | | Fix code duplication in NotificationsHelperDmitriy Zaporozhets2015-11-161-25/+13
| * | | | Remove duplicate methods in uploadersDmitriy Zaporozhets2015-11-164-51/+25
| |/ / /
* | | | Add support for git lfs.lfsMarin Jankovski2015-11-165-3/+59
|/ / /
* | | Merge branch 'fix_trailing_title_space' of https://gitlab.com/dblessing/gitla...Dmitriy Zaporozhets2015-11-162-2/+6
|\ \ \
| * | | Fix trailing space issue with merge requests and issues. Fixes #2514Drew Blessing2015-11-102-2/+6
* | | | Revert "Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-provider"rs-revert-gh-9812Robert Speicher2015-11-151-27/+19
| |/ / |/| |
* | | Merge branch 'impersonate' into 'master' Dmitriy Zaporozhets2015-11-146-7/+47
|\ \ \
| * | | refactor login as to be impersonation with better login/logoutJames Newton2015-10-296-7/+47
* | | | Merge branch 'annotate-models' into 'master' Dmitriy Zaporozhets2015-11-1428-77/+177
|\ \ \ \
| * | | | Annotate modelsDmitriy Zaporozhets2015-11-1328-77/+177
* | | | | Merge branch 'builds_feature' into 'master' Kamil TrzciƄski2015-11-1310-38/+35
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix broken testsKamil Trzcinski2015-11-131-24/+0
| * | | | Expose CI enable option in project featuresKamil Trzcinski2015-11-139-14/+35
* | | | | Merge branch 'refactor-complex-methods' into 'master' Dmitriy Zaporozhets2015-11-134-76/+98
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Split complex method EventsHelper#event_feed_url.Dmitriy Zaporozhets2015-11-131-11/+15
| * | | | Split complex method Issues::UpdateService#executeDmitriy Zaporozhets2015-11-131-13/+16
| * | | | Split complex method SystemHooksService#build_event_dataDmitriy Zaporozhets2015-11-131-30/+42
| * | | | Split huge method MergeRequests::UpdateService#executeDmitriy Zaporozhets2015-11-131-22/+25
* | | | | Merge pull request #9825 from huacnlee/cache-application-settingDmitriy Zaporozhets2015-11-132-3/+15
|\ \ \ \ \
| * | | | | Add caching for ApplicationSetting, Ci::ApplicationSetting.Jason Lee2015-11-122-3/+15
| | |_|/ / | |/| | |
* | | | | Add ignore white space option in merge request diffMinsik Yoon2015-11-135-6/+21
| |/ / / |/| | |
* | | | Merge branch 'use-path-for-new-issue-button' into 'master' Dmitriy Zaporozhets2015-11-121-1/+1
|\ \ \ \
| * | | | Use a relative link instead of full URL with New Issue button to be consistentStan Hu2015-10-171-1/+1
* | | | | Merge branch 'fix-avatar-not-showing' of https://gitlab.com/stanhu/gitlab-ceDmitriy Zaporozhets2015-11-124-4/+4
|\ \ \ \ \
| * | | | | Fix avatars not showing in Atom feeds and project issues when Gravatar disabledStan Hu2015-11-104-4/+4
* | | | | | Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-listDmitriy Zaporozhets2015-11-125-13/+16
|\ \ \ \ \ \
| * | | | | | Avoid render edit_form in each notes.Jason Lee2015-11-125-13/+16
| | |_|/ / / | |/| | | |