summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |_|/ / | |/| | |
* | | | | Merge branch 'ci-deprecate-dumped-yaml' into 'master' Kamil Trzciński2015-11-122-23/+0
|\ \ \ \ \
| * | | | | Remove deprecated dumped yaml file generated from previous job definitionsci-deprecate-dumped-yamlKamil Trzcinski2015-11-102-23/+0
* | | | | | Merge branch 'fix_project_build_links' into 'master' Kamil Trzciński2015-11-121-1/+1
|\ \ \ \ \ \
| * | | | | | fix build linkAndy Brandt2015-11-101-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2015-11-111-1/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'add-comment-to-one-link-in-email-to-prevent-people-adding-it-ba...Dmitriy Zaporozhets2015-11-111-1/+2
| |\ \ \ \ \ \
| | * | | | | | Fix typo in email comment: hone -> oneDmitriy Zaporozhets2015-11-111-2/+2
| | * | | | | | Prevent people from adding the link back.Sytse Sijbrandij2015-11-061-0/+1
* | | | | | | | Change "recent" scopes to sort by "id"Yorick Peterse2015-11-112-2/+2
|/ / / / / / /
* | | | | | | Merge branch 'artifacts' into 'master' Kamil Trzciński2015-11-1110-0/+112
|\ \ \ \ \ \ \
| * | | | | | | Move tmp artifacts to shared/artifacts/tmp/. Check for GitLab-Workhorse nowKamil Trzcinski2015-11-101-2/+2
| * | | | | | | Implement Build ArtifactsKamil Trzcinski2015-11-1010-0/+112
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'ci-build-name-in-notification-email' into 'master' Kamil Trzciński2015-11-104-0/+12
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Send build name and stage in CI notification e-mailci-build-name-in-notification-emailKamil Trzcinski2015-11-104-0/+12
| |/ / / / /
* | | | | | Fix Drone CI service template not saving properlyStan Hu2015-11-101-1/+0
| |_|/ / / |/| | | |
* | | | | Remove text-rendering propertyRobert Speicher2015-11-101-1/+0
* | | | | Merge branch 'improve-ci-graphs'Dmitriy Zaporozhets2015-11-106-44/+59
|\ \ \ \ \
| * | | | | Fix graph description and textimprove-ci-graphsDmitriy Zaporozhets2015-11-101-2/+2
| * | | | | Improve Continuous Integration graphs pageDmitriy Zaporozhets2015-11-106-43/+58
| |/ / / /
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-11-101-1/+0
|\ \ \ \ \
| * | | | | Remove CSS property preventing hard tabs from rendering in Chromium 45Stan Hu2015-11-101-1/+0
* | | | | | Merge pull request #9819 from huacnlee/do-not-use-coffeescript-in-viewDmitriy Zaporozhets2015-11-1030-138/+157
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Replace CoffeeScript block into JavaScript in Views.Jason Lee2015-11-1030-138/+157
| |/ / / /
* | | | | Merge branch 'issue_3072_target_name' into 'master' Dmitriy Zaporozhets2015-11-102-0/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Display target branch on MR list when it is different from project's defaultAnton Baklanov2015-11-102-0/+6
* | | | | Merge remote-tracking branch 'origin/release-notes'Dmitriy Zaporozhets2015-11-1021-36/+194
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add missing param and title for tagrelease-notesDmitriy Zaporozhets2015-11-093-4/+6
| * | | | Refactor release code a bitDmitriy Zaporozhets2015-11-095-15/+15