summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Expose avatar_url when requesting list of projects from API with simple=truedm-simple-project-avatar-urlDouwe Maan2017-09-265-5/+14
* Merge branch 'patch-2' into 'master'Douwe Maan2017-09-261-1/+1
|\
| * Update gitlab-shell to 5.9.2Jonathon Reinhart2017-09-221-1/+1
* | Merge branch 'rs-remove-dead-markdown-pipeline' into 'master'Douwe Maan2017-09-261-32/+0
|\ \
| * | Remove dead `Gitlab::Markdown::Pipeline` classrs-remove-dead-markdown-pipelineRobert Speicher2017-09-251-32/+0
* | | Merge branch '31094-define-color-priorities' into 'master'Annabel Dunstone Gray2017-09-2612-58/+58
|\ \ \
| * | | Update light colors, remove ’25’ and add ‘950’ shades31094-define-color-prioritiesPedro Moreira da Silva2017-09-2312-58/+58
* | | | Merge branch 'acet-repo-editor-fix-reopening-existing-file' into 'master'Jacob Schatz2017-09-251-1/+1
|\ \ \ \
| * | | | RepoEditor: Fix reopening the existing file on refresh.acet-repo-editor-fix-reopening-existing-fileFatih Acet2017-09-221-1/+1
* | | | | Merge branch '37912-fix-dash-in-note-access-role' into 'master'Rémy Coutable2017-09-252-1/+7
|\ \ \ \ \
| * | | | | Fix a dash being rendered in the note's access roleMicael Bergeron2017-09-252-1/+7
|/ / / / /
* | | | | Merge branch 'rc/tag-specs' into 'master'38362-delayed-pr-merge-wait-time-40m-1hRobert Speicher2017-09-251-2/+10
|\ \ \ \ \
| * | | | | Automatically set a :type for specsrc/tag-specsRémy Coutable2017-09-221-2/+10
* | | | | | Merge branch 'docs/chmod-644' into 'master'Rémy Coutable2017-09-2567-2/+16
|\ \ \ \ \ \
| * | | | | | Check for exec permissions also in app/docs/chmod-644Achilleas Pipinellis2017-09-2511-3/+2
| * | | | | | Add check for exec permissions and refactor lint doc scriptAchilleas Pipinellis2017-09-251-2/+17
| * | | | | | Change mode to 644 for all md and png filesAchilleas Pipinellis2017-09-2556-0/+0
* | | | | | | Merge branch '38155-autodevops-typo' into 'master'Achilleas Pipinellis2017-09-251-1/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix auto devops typos in Pipeline Settings viewMark Fletcher2017-09-221-1/+2
| | |_|/ / / | |/| | | |
* | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status