summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* use full caps RSS instead of rssAlexis Reigel2017-05-241-1/+1
* rake task to reset all rss tokensAlexis Reigel2017-05-241-0/+10
* Merge branch 'dm-outdated-system-note' into 'master'Grzegorz Bizon2017-05-243-92/+162
|\
| * Address reviewDouwe Maan2017-05-241-1/+3
| * Fix specsdm-outdated-system-noteDouwe Maan2017-05-231-1/+0
| * Add system note with link to diff comparison when MR discussion becomes outdatedDouwe Maan2017-05-233-92/+161
* | Merge branch 'dm-fix-routes' into 'master'Robert Speicher2017-05-244-10/+193
|\ \
| * | Remove changes that are not absolutely necessarydm-fix-routesDouwe Maan2017-05-238-277/+270
| * | Fix ambiguous routing issues by teaching router about reserved wordsDouwe Maan2017-05-238-88/+278
* | | Merge branch '29852-latex-formatting' into 'master'Robert Speicher2017-05-244-7/+37
|\ \ \
| * | | Fix LaTeX formatting for AsciiDoc wikiJarka Kadlecova2017-05-244-7/+37
* | | | Merge branch 'sentry-clientside-releases' into 'master'Phil Hughes2017-05-241-0/+1
|\ \ \ \
| * | | | Use Gitlab::REVISION over reading HEAD sha from gitsentry-clientside-releasesLuke "Jared" Bennett2017-05-211-0/+1
* | | | | Merge branch 'fix-notify-post-receive' into 'master'Stan Hu2017-05-231-8/+9
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Prevent errors from non-functional notify_post_receive endpointfix-notify-post-receiveAlejandro Rodríguez2017-05-181-8/+9
* | | | | Merge branch 'zj-fix-pipeline-etag' into 'master'Kamil Trzciński2017-05-231-1/+1
|\ \ \ \ \
| * | | | | Add Etag caching for Pipeline#Show actionZ.J. van de Weg2017-05-221-1/+1
| | |_|_|/ | |/| | |
* | | | | Fix rubocopfix-backup-raketaskAchilleas Pipinellis2017-05-231-1/+0
* | | | | Add missing regex to backup managerAchilleas Pipinellis2017-05-231-1/+6
|/ / / /
* | | | Avoid resource intensive login checks if password is not providedHoratiu Eugen Vlad2017-05-211-1/+4
| |/ / |/| |
* | | Merge branch 'dm-no-conflicts-when-branches-are-missing' into 'master'Robert Speicher2017-05-181-1/+1
|\ \ \
| * | | Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missingDouwe Maan2017-05-181-1/+1
* | | | Merge branch 'dm-catch-uri-errors' into 'master'Robert Speicher2017-05-181-1/+1
|\ \ \ \
| * | | | Catch all URI errors in ExternalLinkFilterdm-catch-uri-errorsDouwe Maan2017-05-181-1/+1
| |/ / /
* | | | Fixes for the rename reserved paths helpersBob Van Landuyt2017-05-183-1/+16
* | | | Remove Services count from usage ping payload.Ruben Davila2017-05-181-1/+0
* | | | Merge branch 'dm-gemfile-viewer'Rémy Coutable2017-05-181-3/+19
|\ \ \ \ | |/ / / |/| | |
| * | | Add auxiliary blob viewers to dependency filesDouwe Maan2017-05-171-3/+19
* | | | Merge branch 'gitaly-local-branches' into 'master'Douwe Maan2017-05-184-13/+83
|\ \ \ \
| * | | | Incorporate Gitaly's local_branches operation into repo codegitaly-local-branchesAlejandro Rodríguez2017-05-174-6/+82
| * | | | Compare ids of commits if present for equality testAlejandro Rodríguez2017-05-161-7/+1
* | | | | Merge branch 'add-current_user-avatar_url-to-gon' into 'master'Phil Hughes2017-05-181-0/+1
|\ \ \ \ \
| * | | | | Add current_user_avatar_url to gonadd-current_user-avatar_url-to-gonLuke "Jared" Bennett2017-05-181-0/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'sh-fix-container-registry-s3-redirects' into 'master'Kamil Trzciński2017-05-181-4/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Properly handle container registry redirects to fix metadata stored on a S3 b...sh-fix-container-registry-s3-redirectsStan Hu2017-05-171-4/+10
* | | | | Fix invalid object reference in ee_compat_check scriptrs-fix-ee-compatRobert Speicher2017-05-171-1/+1
| |_|/ / |/| | |
* | | | Merge branch '32085-improve-ee-compat-check' into 'master' Robert Speicher2017-05-171-3/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Fetch CE/branch before running `git apply --check --3way patch`32085-improve-ee-compat-checkRémy Coutable2017-05-161-3/+5
| |/ /
* | | Re-enable gitaly migration for ref_name_for_sha after bugfixesreenable-gitaly-ref-nameAlejandro Rodríguez2017-05-162-14/+14
| |/ |/|
* | Merge branch 'cherry-pick-0663458c' into 'master' Douwe Maan2017-05-163-6/+6
|\ \ | |/ |/|
| * Merge branch 'bvl-rename-build-events-to-job-events' into 'master' cherry-pick-0663458cDouwe Maan2017-05-163-6/+6
* | Update ee_compat_check.rb to include `git apply --reject` suggestionLuke "Jared" Bennett2017-05-161-0/+11
|/
* Merge branch 'dm-rename-column-concurrently-with-null' into 'master' Yorick Peterse2017-05-151-1/+2
|\
| * Disallow NULL on renamed column after default has been setDouwe Maan2017-05-151-1/+2
* | Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'"Douwe Maan2017-05-153-6/+6
* | Merge branch 'use-gitaly-migrate' into 'master' Douwe Maan2017-05-151-3/+3
|\ \ | |/ |/|
| * Use gitaly_migrate helper on all current migrations in repositoryuse-gitaly-migrateAlejandro Rodríguez2017-05-111-3/+3
* | Merge branch 'rename-rendered_title' into 'master' Rémy Coutable2017-05-151-3/+3
|\ \
| * | Rename all references to rendered_title to realtime_changesrename-rendered_titleLuke "Jared" Bennett2017-05-131-3/+3
* | | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' Douwe Maan2017-05-153-6/+6
|\ \ \