summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* reverting more MR ajax files, will appear in different commitJacob Schatz2016-01-123-25/+30
* 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-11217-907/+1391
|\
| * Merge branch 'fix/ci-linter-sequence-validations' into 'master' Robert Speicher2016-01-112-5/+7
| |\
| | * Allow subsequent validations in CI Linterfix/ci-linter-sequence-validationsGrzegorz Bizon2016-01-112-5/+7
| * | Merge branch 'fix-ci-builds-for-tags' into 'master' Robert Speicher2016-01-111-0/+1
| |\ \
| | * | Generate builds when creating tag using web interfacefix-ci-builds-for-tagsKamil Trzcinski2016-01-111-0/+1
| * | | Merge branch 'group-issues-sorting' into 'master' Dmitriy Zaporozhets2016-01-116-7/+12
| |\ \ \
| | * | | Removed ORDER BY in "of_group" scopesgroup-issues-sortingYorick Peterse2016-01-072-2/+4
| | * | | 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
| * | | | 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-113-107/+105
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'rs-zenmode-cleanup' into 'master' Douwe Maan2016-01-113-107/+105
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Refactor ZenModers-zenmode-cleanupRobert Speicher2016-01-083-107/+105
| | | |/ / /
| * | | | | 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-111-5/+8
| |\ \ \ \ \
| | * | | | | Fix caching issue where build status was not updating in project dashboardStan Hu2016-01-081-5/+8
| | | |/ / / | | |/| | |
| * | | | | 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 '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
| | |/ / / / /
| * | | | | | Merge branch 'add-pencil-icon-to-group-page' into 'master' Dmitriy Zaporozhets2016-01-111-3/+6
| |\ \ \ \ \ \
| | * | | | | | Check for current userStan Hu2016-01-101-1/+2
| | * | | | | | Add pencil icon to edit group settingsStan Hu2016-01-101-3/+5
| * | | | | | | Merge branch 'fix-duplicate-branch-activity' of https://gitlab.com/stanhu/git...Dmitriy Zaporozhets2016-01-112-2/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Fix duplicated branch creation/deletion events when using Web UIStan Hu2016-01-082-2/+0
| * | | | | | | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-1113-38/+45
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'Issue#5817' into 'master' Stan Hu2016-01-112-4/+4
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | Issue #5817 wording of the web hooks updated on issue and merge eventsiqualisoni2016-01-112-4/+4
| | * | | | | | | | Before project save ensure that a runners_token existsStan Hu2016-01-101-0/+1
| | * | | | | | | | Fix Error 500 when visiting build page of project with nil runners_tokenStan Hu2016-01-102-5/+7
| | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Merge branch 'fix_jira_shortterm' into 'master' Robert Speicher2016-01-101-0/+3
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Do not call API if there is no API URLDrew Blessing2016-01-071-0/+3
| | | |/ / / / /
| | * | | | | | Disable "Already Blocked" button in admin abuse report pageStan Hu2016-01-091-1/+1
| | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch 'cross-project-reference-typo-fix' into 'master' Robert Speicher2016-01-081-1/+1
| | |\ \ \ \ \
| | | * | | | | changes verb `references` to noun `reference`.cross-project-reference-typo-fixJacob Schatz2016-01-081-1/+1
| | | | |/ / / | | | |/| | |
| | * | | | | Remove Block Button from Abuse Reports page if User is Already Blocked Robert Speicher2016-01-081-1/+4
| | |\ \ \ \ \
| | | * | | | | Show that user is already blocked on Abuse Reportsfix-block-button-still-showing-on-abuse-reports-after-user-is-blockedKelvin2016-01-061-0/+3
View Lorry Controller Status