summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge branch '29852-latex-formatting' into 'master'Robert Speicher2017-05-244-7/+37
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix LaTeX formatting for AsciiDoc wiki Closes #29852 See merge request !11212
| * | | | | | | Fix LaTeX formatting for AsciiDoc wikiJarka Kadlecova2017-05-244-7/+37
| | | | | | | |
* | | | | | | | Merge branch 'sentry-clientside-releases' into 'master'Phil Hughes2017-05-241-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Read HEAD commit and use as sentry releases value Closes #32535 See merge request !11565
| * | | | | | | 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 endpoint See merge request !11509
| * | | | | | | 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
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pipeline etag Closes #32658 See merge request !11615
| * | | | | | Add Etag caching for Pipeline#Show actionZ.J. van de Weg2017-05-221-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Due to a typo this was not actually the case. Now that is fixed and performance should improve because of this.
* | | | | | Fix rubocopfix-backup-raketaskAchilleas Pipinellis2017-05-231-1/+0
| | | | | |
* | | | | | Add missing regex to backup managerAchilleas Pipinellis2017-05-231-1/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10901/diffs introduced a new naming scheme for backups, but the code which cleans up old backups wasn't updated accordingly. In order to maintain backward compatibility, we need to account for 3 naming schemes.
* | | | | Avoid resource intensive login checks if password is not providedHoratiu Eugen Vlad2017-05-211-1/+4
| |/ / / |/| | | | | | | | | | | Fixes #32598
* | | | 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 missing Closes #32544 See merge request !11501
| * | | | 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 ExternalLinkFilter Closes #32076 See merge request !11494
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | This query was timing out and is blocking the sync of usage data for GitLab.com
* | | | | Merge branch 'dm-gemfile-viewer'Rémy Coutable2017-05-181-3/+19
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | See merge request !11346.
| * | | | 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 code Closes #27379 See merge request !10059
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This solves a problem where commits populated with Gitaly were not equal to commits populated with Rugged. This is because Gitaly may not return all fields of a commit for optimizations purposes, which resulted in false negatives when comparing the same commit (commits with the same sha) with different sources.
* | | | | | Merge branch 'add-current_user-avatar_url-to-gon' into 'master'Phil Hughes2017-05-181-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add current_user_avatar_url to gon See merge request !11474
| * | | | | | 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 an S3 backend Closes #22403 See merge request !11429
| * | | | | Properly handle container registry redirects to fix metadata stored on a S3 ↵sh-fix-container-registry-s3-redirectsStan Hu2017-05-171-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backend The previous behavior would include the Authorization header, which would make fetching an S3 blob fail quietly. Closes #22403 Update sh-fix-container-registry-s3-redirects.yml
* | | | | | 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` Closes #32085 See merge request !11412
| * | | | Fetch CE/branch before running `git apply --check --3way patch`32085-improve-ee-compat-checkRémy Coutable2017-05-161-3/+5
| |/ / / | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | 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
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Rename `build_events` to `job_events`, take 2. Closes #31620 See merge request !11403
| * | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' cherry-pick-0663458cDouwe Maan2017-05-163-6/+6
| | | | | | | | | | | | | | | | | | | | | Rename `build_events` to `job_events` Closes #31620 See merge request !11287
* | | 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 set See merge request !11396
| * | 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
| | | | | | | | | This reverts merge request !11287
* | | Merge branch 'use-gitaly-migrate' into 'master' Douwe Maan2017-05-151-3/+3
|\ \ \ | |/ / |/| | | | | | | | Use gitaly_migrate helper on all current migrations in repository See merge request !11309
| * | 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_changes See merge request !11359
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename `build_events` to `job_events` Closes #31620 See merge request !11287
| * | | | Rename `build_events` to `job_events` in codeBob Van Landuyt2017-05-153-6/+6
| | |_|/ | |/| |
* | | | Merge branch 'fix-github-import' into 'master' Douwe Maan2017-05-151-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix token interpolation when setting the Github remote See merge request !11311
| * | | | Reset create callbacks for Issues/MRs while importing GitHub projectsDouglas Barbosa Alexandre2017-05-111-0/+2
| | | | |
| * | | | Fix token interpolation when setting the Github remoteDouglas Barbosa Alexandre2017-05-111-1/+2
| | |_|/ | |/| |
* | | | Merge branch 'gitaly-reuse-stubs' into 'master' Robert Speicher2017-05-156-52/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse gRPC stubs instead of channels Closes #31991 and gitaly#187 See merge request !11244
| * | | | Don't reuse gRPC channelsJacob Vosmaer2017-05-156-52/+36
| | |/ / | |/| | | | | | | | | | | | | | | | | | It seems that bad things happen when two gRPC stubs share one gRPC channel so let's stop doing that. The downside of this is that we create more gRPC connections; one per stub.
* | | | Create a Users FinderGeorge Andrinopoulos2017-05-151-10/+1
| | | |
* | | | Merge branch 'adam-influxdb-hostname' into 'master' Douwe Maan2017-05-151-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow GitLab instance to start when InfluxDB hostname cannot be resolved Closes #24438 See merge request !11356
| * | | | Allow GitLab instance to start when InfluxDB hostname cannot be resolvedadam-influxdb-hostnameAdam Niedzielski2017-05-131-0/+3
| | |_|/ | |/| | | | | | | | | | Closes #24438
View Lorry Controller Status