summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Validate presence of essential params for diff renderingissue_19096Ruben Davila2016-06-242-0/+47
* Merge branch 'optimize-award-emoji' into 'master' Yorick Peterse2016-06-235-12/+25
|\
| * Preload notes/discussions associations (award_emoji: :user)optimize-award-emojiPaco Guzman2016-06-236-14/+27
| * Eager load award emoji on notesZ.J. van de Weg2016-06-232-2/+2
* | Merge branch '18569-fix-diff-note-position' into 'master' Robert Speicher2016-06-231-1/+1
|\ \
| * | Restore old behavior around diff notes to outdated discussionsDouwe Maan2016-06-221-1/+1
* | | Merge branch 'bump-gitlab-git-10-2-1' into 'master' Stan Hu2016-06-232-1/+2
|\ \ \
| * | | Bump gitlab_git to 10.2.3Stan Hu2016-06-231-1/+1
| * | | Bump gitlab_git to 10.2.1 to fix false truncated warnings with ISO-8559 filesStan Hu2016-06-232-1/+2
* | | | Merge branch 'document-emoji-rake-tasks' into 'master' Achilleas Pipinellis2016-06-231-0/+20
|\ \ \ \ | |_|_|/ |/| | |
| * | | Added basic docs for the Emoji Rake tasksdocument-emoji-rake-tasksYorick Peterse2016-06-231-0/+20
* | | | Merge branch 'issue_14563' into 'master' Rémy Coutable2016-06-232-1/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix user creation with stronger minimum password requirements:qNathan Bush2016-06-232-1/+2
* | | | Merge branch 'merge-settings-help-link' into 'master' Stan Hu2016-06-232-1/+2
|\ \ \ \
| * | | | Fix merge requests project settings help link anchor.Steve Norman2016-06-232-1/+2
| |/ / /
* | | | Merge branch '18924-gitlab-ce-tags-page-is-not-working-502-read-timeout' into...Yorick Peterse2016-06-232-1/+2
|\ \ \ \
| * | | | Improve performance of searching tags by name by using a memorized tag array18924-gitlab-ce-tags-page-is-not-working-502-read-timeoutAlejandro Rodríguez2016-06-232-1/+2
|/ / / /
* | | | Merge branch 'fix-404-for-pipelines' into 'master' Rémy Coutable2016-06-235-2/+273
|\ \ \ \ | |/ / / |/| | |
| * | | Fix 404 when accessing pipelines as guest user on public projectsKamil Trzcinski2016-06-231-0/+1
| * | | Fix 404 for pipelinesKamil Trzcinski2016-06-234-2/+272
* | | | Merge branch '18915-pagination-with-priority-sort-repeats-results' into 'mast...Rémy Coutable2016-06-233-9/+27
|\ \ \ \
| * | | | Fix pagination on sorts with lots of tiesSean McGivern2016-06-233-9/+27
* | | | | Merge branch 'fix-clickable-code-search-results' into 'master' Robert Speicher2016-06-232-3/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | renamed path to linkbarthc2016-06-232-5/+5
| * | | | Merge branch 'master' into fix-clickable-code-search-resultsbarthc2016-06-23723-4209/+27256
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | fix clickable code search resultsbarthc2016-06-142-3/+5
* | | | | Merge branch 'migration_guide_remove_rubocop' into 'master' Robert Speicher2016-06-231-1/+0
|\ \ \ \ \
| * | | | | Remove Rubocop skip comment from migration style guide [ci skip]Drew Blessing2016-06-231-1/+0
* | | | | | Merge branch 'fix/import-export-gitlab-errors' into 'master' Rémy Coutable2016-06-235-1/+48
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | added changelogfix/import-export-gitlab-errorsJames Lopez2016-06-231-0/+3
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-expo...James Lopez2016-06-231-45/+57
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | fixed pipeline notes issueJames Lopez2016-06-233-0/+42
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-expo...James Lopez2016-06-2378-129/+808
| |\ \ \ \ \
| * | | | | | fix utc errorJames Lopez2016-06-221-1/+3
* | | | | | | Merge branch 'update-influx-docs-management-repo' into 'master' Achilleas Pipinellis2016-06-231-68/+18
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Use influxdb-management for managing InfluxDBupdate-influx-docs-management-repoYorick Peterse2016-06-231-68/+18
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '18663-sidekiq-latency-instrumentation' into 'master' Yorick Peterse2016-06-233-1/+19
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add Sidekiq queue duration to transaction metrics.Paco Guzman2016-06-233-1/+19
* | | | | | Merge branch 'update-influx-continuous-queries' into 'master' Yorick Peterse2016-06-231-45/+57
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Updated InfluxDB continuous queries for 8.9.0Yorick Peterse2016-06-231-45/+57
|/ / / / /
* | | | | Merge branch '18857-new-label-page-needs-work-on-mobile' into 'master' Jacob Schatz2016-06-231-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added bottom padding to label color suggestion link18857-new-label-page-needs-work-on-mobileLuke "Jared" Bennett2016-06-221-0/+1
* | | | | Merge branch 'fix-header-logo' into 'master' Jacob Schatz2016-06-231-0/+4
|\ \ \ \ \
| * | | | | Fix header logo width/height issuesJacob Schatz2016-06-231-1/+0
| * | | | | Restrict header logo to 36px so it doesn't overflow.fix-header-logoConnor Shea2016-06-221-0/+5
* | | | | | Merge branch 'ruby-23-cache' into 'master' Robert Speicher2016-06-221-0/+5
|\ \ \ \ \ \
| * | | | | | Add caching for Ruby 2.3 tests.Connor Shea2016-06-221-0/+5
* | | | | | | Merge branch 'sri' into 'master' Robert Speicher2016-06-222-3/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add clarifying comment and a Changelog entry.Connor Shea2016-06-222-0/+4
| * | | | | | Add Subresource Integrity attribute to CSS and JS assets.Connor Shea2016-06-221-3/+3
|/ / / / / /