summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Correct disabled note form style18608-lock-issuesLuke "Jared" Bennett2017-09-273-7/+30
* Fix karmaLuke "Jared" Bennett2017-09-271-1/+1
* Fix locked and unlocked iconsLuke "Jared" Bennett2017-09-271-2/+2
* Fix static analysisLuke "Jared" Bennett2017-09-271-2/+0
* fix code styleJarka Kadlecova2017-09-272-4/+4
* add discussion lock icon to the system_note_helperJarka Kadlecova2017-09-261-1/+3
* update changelogJarka Kadlecova2017-09-261-2/+1
* use downcase instead of underscoreJarka Kadlecova2017-09-261-1/+1
* add feature specs for discussion lockJarka Kadlecova2017-09-263-1/+156
* Disable comment form when discussion locked for userJarka Kadlecova2017-09-264-5/+26
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issuesJarka Kadlecova2017-09-25477-3824/+7739
|\
| * Merge branch 'sh-fix-email-provider-take2' into 'master'Yorick Peterse2017-09-252-2/+2
| |\
| | * Fix PG::UniqueViolation external_email migrationsh-fix-email-provider-take2Stan Hu2017-09-252-2/+2
| * | Merge branch '34371-cycle-analitcs-global' into 'master'Phil Hughes2017-09-254-59/+54
| |\ \
| | * | Removes cycle analytics service and store from global namespaceFilipa Lacerda2017-09-254-59/+54
| |/ /
| * | Merge branch 'gitaly-508-find-commits' into 'master'38204-comment-form-doesn-t-switch-back-to-write-tab-after-submittingDouwe Maan2017-09-254-2/+44
| |\ \
| | * | Migrate Gitlab::Git::Repository#log to GitalyKim "BKC" Carlbäcker2017-09-254-2/+44
| * | | Merge branch '38189-fix-user-avatar-url-cdn' into 'master'Douwe Maan2017-09-253-50/+79
| |\ \ \
| | * | | Update tests to reflect `user_avatar_without_link` helper changes38189-fix-user-avatar-url-cdnkushalpandya2017-09-251-40/+62
| | * | | Add `data-src` when image is to be lazy loaded, use `tag` helper instead of `...kushalpandya2017-09-251-9/+16
| | * | | Remove unnecessary use of `gsub`kushalpandya2017-09-251-1/+1
| * | | | Merge branch 'improve_sorting_list' into 'master'Douwe Maan2017-09-2519-332/+304
| |\ \ \ \
| | * | | | Improve list of sorting optionsVitaliy @blackst0ne Klachkov2017-09-2319-332/+304
| * | | | | Merge branch 'project-page-clearer' into 'master'Filipa Lacerda2017-09-257-7/+59
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | simplify link_to callproject-page-clearerPhil Hughes2017-09-221-4/+2
| | * | | | Fixes dashboard/projects empty state showing when viewing personal projectsPhil Hughes2017-09-223-7/+11
| | * | | | Add context tabs to dashboard/projectsPhil Hughes2017-09-225-0/+50
| * | | | | Merge branch 'fly-out-nav-mousepos-error' into 'master'Filipa Lacerda2017-09-252-1/+7
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | spec fixesfly-out-nav-mousepos-errorPhil Hughes2017-09-221-1/+1
| | * | | | Fixed fly-out error if mousePos array is emptyPhil Hughes2017-09-222-1/+7
| * | | | | Merge branch '38280-undefined-run_command-when-running-rake-gitlab-check' int...Douwe Maan2017-09-255-2/+44
| |\ \ \ \ \
| | * | | | | Fixed few gitlab:check tasks that were failing with exception38280-undefined-run_command-when-running-rake-gitlab-checkGabriel Mazetto2017-09-255-2/+44
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch '38021-add-instructions-for-upgrading-from-ce-to-ee-using-gitlab...Achilleas Pipinellis2017-09-251-0/+16
| |\ \ \ \ \
| | * | | | | Add instructions for upgrading from CE to EE using GitLab Omnibus chart - docsJoshua Lambert2017-09-251-0/+16
| |/ / / / /
| * | | | | Merge branch 'rs-allow-name-on-anchors' into 'master'Douwe Maan2017-09-253-3/+13
| |\ \ \ \ \
| | * | | | | Make the "customizes the whitelist only once" spec less brittlers-allow-name-on-anchorsRobert Speicher2017-09-221-1/+3
| | * | | | | Re-allow `name` attribute on user-provided anchor HTMLRobert Speicher2017-09-223-2/+10
| * | | | | | Merge branch 'rc/refactor-project_policy_spec-ce' into 'master'Douwe Maan2017-09-251-47/+86
| |\ \ \ \ \ \
| | * | | | | | Refactor spec/policies/project_policy_spec.rb to minimize the diff with EErc/refactor-project_policy_spec-ceRémy Coutable2017-09-221-47/+86
| * | | | | | | Merge branch '37287-remove-nav-gradient' into 'master'Phil Hughes2017-09-251-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Remove navbar gradient37287-remove-nav-gradientAnnabel Dunstone Gray2017-09-221-2/+2
| * | | | | | | | Merge branch 'sh-remove-additional-grit-settings' into 'master'Rémy Coutable2017-09-251-3/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove Grit settings from default settingssh-remove-additional-grit-settingsStan Hu2017-09-231-3/+1
| * | | | | | | | | Merge branch 'master' into 'master'Rémy Coutable2017-09-251-2/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | fix minor spelling mistakesRené Genz2017-09-201-2/+2
| * | | | | | | | | Update CHANGELOG.md for 10.0.1Stan Hu2017-09-232-5/+4
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'sh-fix-issue-38246' into 'master'Yorick Peterse2017-09-233-2/+7
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Fix duplicate key errors in PostDeployMigrateUserExternalMailData migrationsh-fix-issue-38246Stan Hu2017-09-223-2/+7
| |/ / / / / / /
| * | | | | | | Merge branch '38171-workaround' into 'master'Robert Speicher2017-09-221-1/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Workaround for n+1 in Projects::TreeController#show38171-workaroundAndrew Newdigate2017-09-221-1/+4
| | | |_|_|/ / / | | |/| | | | |
View Lorry Controller Status