summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* gets merge request discussion working againcomment-and-close-button-does-not-submit-commentJacob Schatz2016-01-123-4/+24
* adds back in discussion.haml.html for issues commenting and closing/reopening...Jacob Schatz2016-01-122-4/+4
* removing last chunk of MR ajax changes, rest will be in another MRJacob Schatz2016-01-125-5/+17
* reverting more MR ajax files, will appear in different commitJacob Schatz2016-01-125-124/+31
* reverting MR ajax changes, which will be in a different MRJacob Schatz2016-01-122-16/+2
* reverting _mr_title.html.hamlJacob Schatz2016-01-121-16/+10
* reverting merge_request_controllerJacob Schatz2016-01-121-9/+2
* restores merge request coffee fileJacob Schatz2016-01-121-49/+0
* reverting _disscusionJacob Schatz2016-01-121-4/+5
* fixes conflictsJacob Schatz2016-01-11422-2997/+4659
|\
| * Update CHANGELOGRobert Speicher2016-01-111-6/+6
| * Merge branch 'fix/ci-linter-sequence-validations' into 'master' Robert Speicher2016-01-114-5/+16
| |\
| | * Allow subsequent validations in CI Linterfix/ci-linter-sequence-validationsGrzegorz Bizon2016-01-114-5/+16
| * | Merge branch 'fix-ci-builds-for-tags' into 'master' Robert Speicher2016-01-112-0/+2
| |\ \
| | * | Generate builds when creating tag using web interfacefix-ci-builds-for-tagsKamil Trzcinski2016-01-112-0/+2
| * | | Merge branch 'gitlab-workhorse-0.5.3' into 'master' Robert Speicher2016-01-113-3/+3
| |\ \ \
| | * | | Use gitlab-workhorse 0.5.3gitlab-workhorse-0.5.3Jacob Vosmaer2016-01-113-3/+3
| * | | | Merge branch 'optimize_ldap' into 'master' Douwe Maan2016-01-117-11/+37
| |\ \ \ \
| | * | | | Optimize LDAP and add a search timeoutDrew Blessing2016-01-117-11/+37
| * | | | | Merge branch 'add-action-to-all-metrics' into 'master' Yorick Peterse2016-01-116-25/+41
| |\ \ \ \ \
| | * | | | | Tag all transaction metrics with an "action" tagYorick Peterse2016-01-116-25/+41
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'rs-omniauth-client-versions' into 'master' Dmitriy Zaporozhets2016-01-112-4/+4
| |\ \ \ \ \
| | * | | | | Add versions to omniauth_crowd and omniauth-azure-oauth2rs-omniauth-client-versionsRobert Speicher2016-01-102-4/+4
| * | | | | | Merge branch 'group-issues-sorting' into 'master' Dmitriy Zaporozhets2016-01-118-13/+23
| |\ \ \ \ \ \
| | * | | | | | Removed ORDER BY in "of_group" scopesgroup-issues-sortingYorick Peterse2016-01-072-2/+4
| | * | | | | | Fixed issue sorting specs for ID changesYorick Peterse2016-01-071-6/+6
| | * | | | | | Updated Gemfile.lock due to Bundler re-orderingYorick Peterse2016-01-071-5/+5
| | * | | | | | Drop projects order in IssuableFinderYorick Peterse2016-01-071-2/+2
| | * | | | | | Don't pluck IDs when getting issues/MRs per groupYorick Peterse2016-01-072-2/+2
| | * | | | | | Sort by ID when sorting using "Recently created"Yorick Peterse2016-01-073-3/+6
| | * | | | | | Added an index on milestones.titleYorick Peterse2016-01-071-0/+5
| * | | | | | | Merge branch 'rs-woff-fonts' into 'master' Dmitriy Zaporozhets2016-01-1132-7/+8
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Use WOFF versions of SourceSansPrors-woff-fontsRobert Speicher2016-01-0932-7/+8
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-01-115-128/+119
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'rs-zenmode-cleanup' into 'master' Douwe Maan2016-01-115-128/+119
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | Refactor ZenModers-zenmode-cleanupRobert Speicher2016-01-085-128/+119
| * | | | | | | | Merge pull request #9960 from huacnlee/fix/do-not-use-coffeescript-in-erbDouwe Maan2016-01-113-22/+24
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | use JavaScript instead of CoffeeScript in Views, the reason #9819Jason Lee2016-01-113-22/+24
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'fix-build-status-caching' into 'master' Dmitriy Zaporozhets2016-01-112-5/+9
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Fix caching issue where build status was not updating in project dashboardStan Hu2016-01-082-5/+9
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'load-autocomplete-when-needed' into 'master' Dmitriy Zaporozhets2016-01-112-12/+15
| |\ \ \ \ \ \
| | * | | | | | Only load autocomplete data when actually neededYorick Peterse2016-01-112-12/+15
| * | | | | | | Merge branch 'fix-build-page-typo' into 'master' Kamil Trzciński2016-01-111-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Fix typo in build page of projectsSteffen Köhler2016-01-101-1/+1
| * | | | | | | Merge branch 'doc-update' into 'master' Achilleas Pipinellis2016-01-111-2/+3
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Update docs for shared runner default settingsLuke Waite2016-01-101-2/+3
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'autocomplete-on-load' into 'master' Dmitriy Zaporozhets2016-01-111-13/+12
| |\ \ \ \ \ \
| | * | | | | | Load autocomplete data when loading an issue pageautocomplete-on-loadYorick Peterse2016-01-081-13/+12
| * | | | | | | Merge branch 'new-branch-position-fix' into 'master' Dmitriy Zaporozhets2016-01-112-2/+7
| |\ \ \ \ \ \ \
| | * | | | | | | fixes new branch button positioning, when visible and not visible containernew-branch-position-fixJacob Schatz2016-01-082-2/+7
View Lorry Controller Status