summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'help-landing-page-customizations' into 'master'Douwe Maan2017-06-142-0/+7
|\ | | | | | | | | Allow more customization to Help landing page See merge request !11878
| * Help landing page customizationsRobin Bobbitt2017-06-142-0/+7
| |
* | Merge branch 'dm-diff-viewers' into 'master'Sean McGivern2017-06-143-2/+111
|\ \ | | | | | | | | | | | | | | | | | | Implement diff viewers Closes #30501 and #19931 See merge request !11777
| * | Implement diff viewersDouwe Maan2017-06-143-2/+111
| | |
* | | Merge branch '2525-backport-kubernetes-service-changes' into 'master'Kamil Trzciński2017-06-141-6/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Backport EE changes to the Kubernetes service Closes gitlab-ee#2525 See merge request !12139
| * | Backport EE changes to the Kubernetes serviceNick Thomas2017-06-141-6/+6
| | |
* | | Merge branch 'zj-raise-etag-route-regex-miss' into 'master'Kamil Trzciński2017-06-143-3/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Raise etag route regex miss Closes #33106 See merge request !12084
| * | Revert to passing the path when matching key to the routerzj-raise-etag-route-regex-missZ.J. van de Weg2017-06-122-3/+3
| | | | | | | | | | | | | | | This was edited to the request, but this won't work if the data is not available at the time of setting the key for the first time.
| * | Fix etag route missesZ.J. van de Weg2017-06-121-2/+2
| | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#33106
| * | Raise exception on invalid pipeline cacheKamil Trzcinski2017-06-121-0/+2
| | |
* | | Merge branch 'feature/add-support-for-services-configuration' into 'master'Grzegorz Bizon2017-06-147-7/+125
|\ \ \ | | | | | | | | | | | | | | | | Add support for services configuration in .gitlab-ci.yml See merge request !8578
| * | | Remove Gitlab::Ci::Config::Entry::DockerImageTomasz Maczukin2017-06-123-34/+23
| | | |
| * | | Refactor old formad handling in lib/ci/api/entities.rbTomasz Maczukin2017-06-121-6/+2
| | | |
| * | | Rename API::Entities::JobRequest::ServiceImage to ↵Tomasz Maczukin2017-06-121-2/+2
| | | | | | | | | | | | | | | | API::Entities::JobRequest::Service
| * | | Ensure that old API v1 generates still the same outputTomasz Maczukin2017-06-121-1/+19
| | | |
| * | | Send new configuration options with job's payloadTomasz Maczukin2017-06-122-4/+15
| | | |
| * | | Add support for docker image configuration in .gitlab-ci.ymlTomasz Maczukin2017-06-125-2/+106
| |/ /
* | | Merge branch 'fix-external-ci-services' into 'master'Grzegorz Bizon2017-06-141-0/+4
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Allow to access statuses for external CI services Closes #30714, #29369, and #15220 See merge request !11176
| * | Update tests and applicationfix-external-ci-servicesKamil Trzcinski2017-06-131-1/+1
| | |
| * | Allow to access pipelines even if they are disabled, but only present jobs ↵Kamil Trzcinski2017-06-131-0/+4
| | | | | | | | | | | | and commit statuses without giving ability to access them
* | | Merge branch 'fix-github-clone-wiki' into 'master'Sean McGivern2017-06-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | GitHub - Fix token interpolation when cloning wiki repository See merge request !12107
| * | | Github - Fix token interpolation when cloning wiki repositoryDouglas Barbosa Alexandre2017-06-121-1/+1
| | | |
* | | | Add database helpers 'add_timestamps_with_timezone' and ↵32054-rails-should-use-timestamptz-database-type-for-postgresqlblackst0ne2017-06-131-0/+33
| |/ / |/| | | | | | | | 'timestamps_with_timezone'
* | | Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-124-0/+164
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add an optional performance bar to view performance metrics for the current page Closes #29010 See merge request !11439
| * | | DRYed peek-pg/mysql2 views and update peek-rblineprof monkey-patch file29010-perf-barRémy Coutable2017-06-091-21/+14
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Ensure peek-performance_bar doesn't break existing functionalitiesRémy Coutable2017-06-091-0/+22
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Fix spec failures and add a feature flag for the performance barRémy Coutable2017-06-091-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Fix Rubocop offenses, improve SQL duration format and changelog entryRémy Coutable2017-06-092-10/+23
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Display queries duration in performance bar queries modalRémy Coutable2017-06-092-42/+8
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Fix replacement of Pygments with RougeRémy Coutable2017-06-091-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Don't use Pygment,rb, use Rouge instead, and put peek-pg in the :postgres groupRémy Coutable2017-06-091-0/+91
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Store Sherlock::Query in Peek adapterRémy Coutable2017-06-092-0/+72
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | New performance bar that can be enabled with the `p b` shortcutRémy Coutable2017-06-091-0/+7
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'background-migrations' into 'master'30404-high-cpu-usage-on-mrs-with-large-diffsRémy Coutable2017-06-122-0/+31
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Add the ability to perform background migrations See merge request !11854
| * | | Add the ability to perform background migrationsYorick Peterse2017-06-122-0/+31
| | |/ | |/| | | | | | | | | | | | | | | | | | | Background migrations can be used to perform long running data migrations without these blocking a deployment procedure. See MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11854 for more information.
* | | Merge branch '33525-use-git-diff-instead-of-git-format-patch' into 'master'Robert Speicher2017-06-121-7/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Generate patch with git diff instead of git format-patch Closes #33525 See merge request !12060
| * | Generate patch with git diff instead of git format-patch33525-use-git-diff-instead-of-git-format-patchRémy Coutable2017-06-091-7/+3
| |/ | | | | | | | | | | | | | | | | | | This will generate a patch: - that is smaller - that applies more cleanly since only the final diff will be applied instead of each commit's diff Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '33003-avatar-in-project-api' into 'master'Rémy Coutable2017-06-121-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Accept avatar file in project API Closes #33003 See merge request !11988
| * | Accept image for avatar in project APIvanadium232017-06-091-0/+1
| | |
* | | Merge branch 'dm-mail-room-check-without-omnibus' into 'master'Robert Speicher2017-06-091-5/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Don't check if MailRoom is running on Omnibus Closes #19607 See merge request !12056
| * | | Don't check if MailRoom is running on Omnibusdm-mail-room-check-without-omnibusDouwe Maan2017-06-091-5/+4
| | |/ | |/|
* | | Merge branch 'cache-diff-size-limits' into 'master'Douwe Maan2017-06-091-2/+18
|\ \ \ | |_|/ |/| | | | | | | | Only look up diff size limit flags once per request See merge request !12048
| * | Only look up diff size limit flags once per requestcache-diff-size-limitsSean McGivern2017-06-091-2/+18
| | |
* | | Merge branch 'tc-link-to-commit-on-help-page' into 'master'Robert Speicher2017-06-091-1/+3
|\ \ \ | |_|/ |/| | | | | | | | Make the revision on the `/help` page clickable See merge request !12016
| * | Make the revision on the `/help` page clickabletc-link-to-commit-on-help-pageToon Claes2017-06-091-1/+3
| | | | | | | | | | | | | | | For quicker access, add hyperlink to the gitlab.com commits page for the current REVISION of GitLab.
* | | Merge branch 'pat-msg-on-auth-failure' into 'master'Rémy Coutable2017-06-091-1/+5
|\ \ \ | | | | | | | | | | | | | | | | Prompt user to create personal access token for Git over HTTP See merge request !11986
| * | | Instruct user to use a personal access token for Git over HTTPRobin Bobbitt2017-06-071-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | If internal auth is disabled and LDAP is not configured on the instance, present the user with a message to create a personal access token if his Git over HTTP auth attempt fails.
* | | | Merge branch 'dm-blob-binaryness-change' into 'master'Sean McGivern2017-06-091-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Detect if blob binaryness changes after loading all data See merge request !11981
| * | | Detect if file that appears to be text in the first 1024 bytes is actually ↵dm-blob-binaryness-changeDouwe Maan2017-06-081-0/+1
| | | | | | | | | | | | | | | | binary afer loading all data
* | | | Merge branch 'upstream-9-2-security' into master-security-updateDJ Mountney2017-06-082-1/+2
|\ \ \ \
View Lorry Controller Status