Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix-github-clone-wiki' into 'master' | Sean McGivern | 2017-06-13 | 1 | -1/+1 |
|\ | | | | | | | | | GitHub - Fix token interpolation when cloning wiki repository See merge request !12107 | ||||
| * | Github - Fix token interpolation when cloning wiki repository | Douglas Barbosa Alexandre | 2017-06-12 | 1 | -1/+1 |
| | | |||||
* | | Add database helpers 'add_timestamps_with_timezone' and ↵32054-rails-should-use-timestamptz-database-type-for-postgresql | blackst0ne | 2017-06-13 | 1 | -0/+33 |
| | | | | | | | | 'timestamps_with_timezone' | ||||
* | | Merge branch '29010-perf-bar' into 'master' | Robert Speicher | 2017-06-12 | 4 | -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-bar | Rémy Coutable | 2017-06-09 | 1 | -21/+14 |
| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Ensure peek-performance_bar doesn't break existing functionalities | Rémy Coutable | 2017-06-09 | 1 | -0/+22 |
| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Fix spec failures and add a feature flag for the performance bar | Rémy Coutable | 2017-06-09 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Fix Rubocop offenses, improve SQL duration format and changelog entry | Rémy Coutable | 2017-06-09 | 2 | -10/+23 |
| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Display queries duration in performance bar queries modal | Rémy Coutable | 2017-06-09 | 2 | -42/+8 |
| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Fix replacement of Pygments with Rouge | Rémy Coutable | 2017-06-09 | 1 | -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 group | Rémy Coutable | 2017-06-09 | 1 | -0/+91 |
| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Store Sherlock::Query in Peek adapter | Rémy Coutable | 2017-06-09 | 2 | -0/+72 |
| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | New performance bar that can be enabled with the `p b` shortcut | Rémy Coutable | 2017-06-09 | 1 | -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-diffs | Rémy Coutable | 2017-06-12 | 2 | -0/+31 |
|\ \ \ | |_|/ |/| | | | | | | | | Add the ability to perform background migrations See merge request !11854 | ||||
| * | | Add the ability to perform background migrations | Yorick Peterse | 2017-06-12 | 2 | -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 Speicher | 2017-06-12 | 1 | -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-patch | Rémy Coutable | 2017-06-09 | 1 | -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 Coutable | 2017-06-12 | 1 | -0/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Accept avatar file in project API Closes #33003 See merge request !11988 | ||||
| * | | Accept image for avatar in project API | vanadium23 | 2017-06-09 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'dm-mail-room-check-without-omnibus' into 'master' | Robert Speicher | 2017-06-09 | 1 | -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-omnibus | Douwe Maan | 2017-06-09 | 1 | -5/+4 |
| | |/ | |/| | |||||
* | | | Merge branch 'cache-diff-size-limits' into 'master' | Douwe Maan | 2017-06-09 | 1 | -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-limits | Sean McGivern | 2017-06-09 | 1 | -2/+18 |
| | | | |||||
* | | | Merge branch 'tc-link-to-commit-on-help-page' into 'master' | Robert Speicher | 2017-06-09 | 1 | -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-page | Toon Claes | 2017-06-09 | 1 | -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 Coutable | 2017-06-09 | 1 | -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 HTTP | Robin Bobbitt | 2017-06-07 | 1 | -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 McGivern | 2017-06-09 | 1 | -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-change | Douwe Maan | 2017-06-08 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | binary afer loading all data | ||||
* | | | | Merge branch 'upstream-9-2-security' into master-security-update | DJ Mountney | 2017-06-08 | 2 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | Bring in security changes from the 9.2.5 release | DJ Mountney | 2017-06-07 | 12 | -11/+17 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ran: - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch - git checkout -b 9-2-5-security-patch origin/v9.2.2 - git apply patchfile.patch - git commit - [Got the sha ref for the commit] - git checkout -b upstream-9-2-security master - git cherry-pick <SHA of the patchfile commit> - [Resolved conflicts] - git cherry-pick --continue | ||||
* | | | | Merge branch '25934-project-snippet-vis' into 'security-9-2' | DJ Mountney | 2017-06-08 | 9 | -10/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fix visibility when referencing snippets See merge request !2101 | ||||
* | | | | Merge branch 'dz-api-x-frame' into 'security-9-2' | DJ Mountney | 2017-06-08 | 1 | -0/+1 |
| |/ / |/| | | | | | | | | | | | | | | Restrict API X-Frame-Options to same origin See merge request !2103 | ||||
* | | | Merge branch 'dm-diff-file-diffable' into 'master' | Sean McGivern | 2017-06-08 | 3 | -9/+13 |
|\ \ \ | | | | | | | | | | | | | | | | | Move diffable? method from Repository to Diff::File See merge request !11980 | ||||
| * | | | Move diffable? method from Repository to Diff::Filedm-diff-file-diffable | Douwe Maan | 2017-06-08 | 3 | -22/+38 |
| | | | | |||||
* | | | | Merge branch 'dm-highlight-diff-file-blob' into 'master' | Sean McGivern | 2017-06-08 | 3 | -27/+36 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Use Diff::File blob methods from diff highlighter See merge request !11978 | ||||
| * | | | | Use Diff::File blob methods from diff highlighterdm-highlight-diff-file-blob | Douwe Maan | 2017-06-08 | 3 | -27/+36 |
| |/ / / | |||||
* | | | | Merge branch '33383_add_bulgarian_translation_of_cycle_analytics_page' into ↵ | Douwe Maan | 2017-06-08 | 1 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add bulgarian translation of Cycle Analytics Page to I18N Closes #33383 See merge request !11958 | ||||
| * | | | | add bulgarian translation of cycle analytics page to I18N | 黄涛 | 2017-06-07 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | Fix #33383 | ||||
* | | | | | Merge branch ↵ | Douwe Maan | 2017-06-08 | 1 | -0/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '33334_add_portuguese_brazil_translation_of_cycle_analytics_page' into 'master' Add portuguese brazil translation of Cycle Analytics Page to I18N Closes #33334 See merge request !11920 | ||||
| * | | | | Update i18n.rb style | Huang Tao | 2017-06-07 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | add portuguese brazil translation of cycle analytics page | 黄涛 | 2017-06-07 | 1 | -0/+1 |
| |/ / / | | | | | | | | | | | | | Fix #33334 | ||||
* | | | | Merge branch 'blob-load-all-data' into 'master' | Grzegorz Bizon | 2017-06-08 | 4 | -4/+4 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Blob#load_all_data! doesn’t need an argument See merge request !11977 | ||||
| * | | | Blob#load_all_data! doesn’t need an argumentblob-load-all-data | Douwe Maan | 2017-06-07 | 4 | -4/+4 |
| | | | | |||||
* | | | | remove the rouge copypasta and add notes to refactor | http://jneen.net/ | 2017-06-07 | 2 | -28/+4 |
| |_|/ |/| | | |||||
* | | | Translate project & repository pages | Bob Van Landuyt | 2017-06-07 | 11 | -23/+23 |
| | | | |||||
* | | | Merge branch 'krakowski_master2' into 'master' | Grzegorz Bizon | 2017-06-07 | 1 | -20/+31 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | Add all pipeline sources as special keywords to 'only' and 'except' Closes #32955 See merge request !11972 | ||||
| * | | use squre bracket | Shinya Maeda | 2017-06-08 | 1 | -1/+1 |
| | | | |||||
| * | | Use source instead of trigger_requests in stage_seeds | Shinya Maeda | 2017-06-08 | 2 | -5/+2 |
| | | | |||||
| * | | Remove source.nil | Shinya Maeda | 2017-06-08 | 1 | -3/+3 |
| | | |