| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Partially revert 1e8dbd46 | Robert Speicher | 2017-06-16 | 1 | -2/+1 |
| | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/33736#note_32561501 | ||||
| * | Merge branch 'merge-request-diffs-table' into 'master' | Douwe Maan | 2017-06-16 | 7 | -13/+40 |
| |\ | | | | | | | | | Add table for files in merge request diffs See merge request !12047 | ||||
| | * | Add table for files in merge request diffs | Sean McGivern | 2017-06-16 | 7 | -13/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds an ID-less table containing one row per file, per merge request diff. It has a column for each attribute on Gitlab::Git::Diff that is serialised currently, with the advantage that we can easily query the attributes of this new table. It does not migrate existing data, so we have fallback code when the legacy st_diffs column is present instead. For a merge request diff to be valid, it should have at most one of: * Rows in this new table, with the correct merge_request_diff_id. * A non-NULL st_diffs column. It may have neither, if the diff is empty. | ||||
| * | | Merge branch 'tc-fix-group-finder-subgrouping' into 'master' | Douwe Maan | 2017-06-16 | 1 | -18/+25 |
| |\ \ | |/ |/| | | | | | | | | | Show private subgroups if member of parent group Closes #32135 See merge request !11764 | ||||
| | * | Better exception message and some additional code comment | Toon Claes | 2017-06-15 | 1 | -1/+3 |
| | | | |||||
| | * | Subgroups page should show groups authorized through inheritance | Toon Claes | 2017-06-15 | 1 | -18/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | When a user is authorized to a group, they are also authorized to see all the ancestor groups and descendant groups. When a user is authorized to a project, they are authorized to see all the ancestor groups too. Closes #32135 See merge request !11764 | ||||
| * | | Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master' | Sean McGivern | 2017-06-16 | 22 | -41/+41 |
| |\ \ | | | | | | | | | | | | | | | | | | | Rename "Slash commands" to "Quick actions" Closes #27070 See merge request !11811 | ||||
| | * | | Rename "Slash commands" to "Quick actions" | Eric Eastwood | 2017-06-15 | 22 | -41/+41 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27070 Deprecate "chat commands" in favor of "slash commands" We looked for things like: - `slash commmand` - `slash_command` - `slash-command` - `SlashCommand` | ||||
| * | | Order issues by priority | Felipe Artur | 2017-06-16 | 1 | -2/+2 |
| | | | |||||
| * | | Remove Drag and drop and sorting from milestone view | Felipe Artur | 2017-06-16 | 1 | -2/+2 |
| | | | |||||
| * | | Add French translations for Cycle Analytics, Project, and Repository pages. | Erwan GEORGET | 2017-06-15 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'deprecate-gitaly-path' into 'master' | Sean McGivern | 2017-06-15 | 2 | -11/+10 |
| |\ \ | | | | | | | | | | | | | Stop using deprecated `path` field on Gitaly messages See merge request !12112 | ||||
| | * | | Stop using deprecated `path` field on Gitaly messages | Alejandro Rodríguez | 2017-06-14 | 2 | -11/+10 |
| | | | | | | | | | | | | | | | | This revealed an error in our configuration generation in gitlab:gitaly:install rake task. The fix is included | ||||
| * | | | #13336 - display multiple messages in both the UI and git output | Mike Ricketts | 2017-06-15 | 1 | -1/+9 |
| | | | | |||||
| * | | | Merge branch 'dm-fix-parser-cache' into 'master' | Sean McGivern | 2017-06-15 | 1 | -1/+1 |
| |\ \ \ | |_|/ |/| | | | | | | | | Don't return nil for missing objects from parser cache See merge request !12168 | ||||
| | * | | Don't return nil for missing objects from parser cachedm-fix-parser-cache | Douwe Maan | 2017-06-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'help-landing-page-customizations' into 'master' | Douwe Maan | 2017-06-14 | 2 | -0/+7 |
| |\ \ \ | |/ / |/| | | | | | | | | Allow more customization to Help landing page See merge request !11878 | ||||
| | * | | Help landing page customizations | Robin Bobbitt | 2017-06-14 | 2 | -0/+7 |
| | | | | |||||
| * | | | Merge branch 'dm-diff-viewers' into 'master' | Sean McGivern | 2017-06-14 | 3 | -2/+111 |
| |\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Implement diff viewers Closes #30501 and #19931 See merge request !11777 | ||||
| | * | | Implement diff viewers | Douwe Maan | 2017-06-14 | 3 | -2/+111 |
| | | | | |||||
| * | | | Merge branch '2525-backport-kubernetes-service-changes' into 'master' | Kamil Trzciński | 2017-06-14 | 1 | -6/+6 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | Backport EE changes to the Kubernetes service Closes gitlab-ee#2525 See merge request !12139 | ||||
| | * | | Backport EE changes to the Kubernetes service | Nick Thomas | 2017-06-14 | 1 | -6/+6 |
| | | | | |||||
| * | | | Merge branch 'zj-raise-etag-route-regex-miss' into 'master' | Kamil Trzciński | 2017-06-14 | 3 | -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-miss | Z.J. van de Weg | 2017-06-12 | 2 | -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 misses | Z.J. van de Weg | 2017-06-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#33106 | ||||
| | * | | Raise exception on invalid pipeline cache | Kamil Trzcinski | 2017-06-12 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge branch 'feature/add-support-for-services-configuration' into 'master' | Grzegorz Bizon | 2017-06-14 | 7 | -7/+125 |
| |\ \ \ | | | | | | | | | | | | | | | | | Add support for services configuration in .gitlab-ci.yml See merge request !8578 | ||||
| | * | | | Remove Gitlab::Ci::Config::Entry::DockerImage | Tomasz Maczukin | 2017-06-12 | 3 | -34/+23 |
| | | | | | |||||
| | * | | | Refactor old formad handling in lib/ci/api/entities.rb | Tomasz Maczukin | 2017-06-12 | 1 | -6/+2 |
| | | | | | |||||
| | * | | | Rename API::Entities::JobRequest::ServiceImage to ↵ | Tomasz Maczukin | 2017-06-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | API::Entities::JobRequest::Service | ||||
| | * | | | Ensure that old API v1 generates still the same output | Tomasz Maczukin | 2017-06-12 | 1 | -1/+19 |
| | | | | | |||||
| | * | | | Send new configuration options with job's payload | Tomasz Maczukin | 2017-06-12 | 2 | -4/+15 |
| | | | | | |||||
| | * | | | Add support for docker image configuration in .gitlab-ci.yml | Tomasz Maczukin | 2017-06-12 | 5 | -2/+106 |
| | |/ / | |||||
| * | | | Merge branch 'fix-external-ci-services' into 'master' | Grzegorz Bizon | 2017-06-14 | 1 | -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-services | Kamil Trzcinski | 2017-06-13 | 1 | -1/+1 |
| | | | | |||||
| | * | | Allow to access pipelines even if they are disabled, but only present jobs ↵ | Kamil Trzcinski | 2017-06-13 | 1 | -0/+4 |
| | | | | | | | | | | | | | and commit statuses without giving ability to access them | ||||
| * | | | 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 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |