root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
51,615 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

51615 Commits

Author SHA1 Message Date
Robert Speicher 8b9cd3c072 Merge branch 'fix/support-gitaly-commit-diff-flags' into 'master' 
Add support for commit diff ignore_whitespace_change and paths flags

Closes gitaly#198

See merge request !11028
 2017-05-07 22:59:30 +00:00
Stan Hu f7cf2a7be6 Merge branch 'revert-58d1cd6b' into 'master' 
Revert "Merge branch 'fix-rspec_profiling-establish_connection-string-deprecation' into 'master'"

See merge request !11153
 2017-05-07 22:36:55 +00:00
Kamil Trzciński 66b225d49f Merge branch 'zj-better-view-pipeline-schedule' into 'master' 
Add Pipeline Schedules that supersedes experimental Trigger Schedule

Closes #30882

See merge request !10853
 2017-05-07 22:35:58 +00:00
Zeger-Jan van de Weg 8df3997a92 Add Pipeline Schedules that supersedes experimental Trigger Schedule 2017-05-07 22:35:56 +00:00
Stan Hu e08130223c Revert "Merge branch 'fix-rspec_profiling-establish_connection-string-deprecation' into 'master'" 
This reverts merge request !11150
 2017-05-07 22:35:20 +00:00
Stan Hu 8a0cde81fe Merge branch 'another-attempt-at-access_control_ce_spec-transient-failure' into 'master' 
Another attempt at access_control_ce_spec

Closes #31827

See merge request !11123
 2017-05-07 22:12:05 +00:00
Stan Hu 58d1cd6beb Merge branch 'fix-rspec_profiling-establish_connection-string-deprecation' into 'master' 
Cast ENV['RSPEC_PROFILING_POSTGRES_URL'] to symbol in establish_connection call …

See merge request !11150
 2017-05-07 22:05:15 +00:00
Ahmad Sherif 2f60a402d1 Remove stubbing from Gitlab::GitalyClient::Commit specs 
Closes gitaly#198
 2017-05-07 23:37:42 +02:00
Ahmad Sherif 34cd109797 Re-enable Gitaly commit_raw_diff feature 2017-05-07 23:37:42 +02:00
Stan Hu 5527342330 Merge branch 'correctly-stub-application-settings-in_signup_spec' into 'master' 
Correctly stub application settings in signup_spec.rb

See merge request !11151
 2017-05-07 21:32:23 +00:00
Kamil Trzciński 8cd578a7da Merge branch '25226-realtime-pipelines-fe' into 'master' 
Rewrite Pipeline Graph in Vue.js to allow realtime

Closes #25226 and #31557

See merge request !10878
 2017-05-07 18:18:05 +00:00
Z.J. van de Weg e0e52fe582 Fix test| 2017-05-07 18:26:39 +02:00
Luke "Jared" Bennett e6f008bb84 Cast ENV['RSPEC_PROFILING_POSTGRES_URL'] to symbol in establish_connection call of rspec_profiling.rb 2017-05-07 15:34:27 +00:00
Luke "Jared" Bennett b1f753f7f2 Correctly stub application settings in signup_spec.rb 2017-05-07 15:24:15 +00:00
Kamil Trzcinski c195b313ad
Make test that actually displays pipeline graph 2017-05-07 14:09:21 +02:00
Filipa Lacerda b46d38aef4 Move file loading to the top of the file 2017-05-06 22:54:43 +01:00
Filipa Lacerda 8f64091a95 Adds missing CSS class 2017-05-06 21:55:40 +01:00
Filipa Lacerda cc27180ecd Merge branch 'master' into 25226-realtime-pipelines-fe 
* master: (40 commits)
  Use GitLab Pages v0.4.2
  Do not reprocess actions when user retries pipeline
  Add specs for extended status for manual actions
  Refine inheritance model of extended CI/CD statuses
  Introduce generic manual action extended status class
  Check ability to update build on the API resource
  Require build to be present in the controller
  Authorize build update on per object basis
  Use update build policy instead of new play policy
  Improve environment policy class
  Rephrase documentation for protected actions feature
  Improve code style related to protected actions
  Add changelog entry for external env URL btn fix
  Hide environment external URL button if not defined
  Fix builds controller spec related to protected actions
  Fix environment policy class name in specs
  Add Changelog entry for protected manual actions
  Document protected manual actions feature
  Improve specs for jobs API regarding manual actions
  Fix Rubocop offense in environments policy class
  ...
 2017-05-06 21:36:03 +01:00
Filipa Lacerda 13b31d25ec Fix broken css class 2017-05-06 21:35:07 +01:00
Kamil Trzciński 6ad3814e1b Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into 'master' 
Check access to a branch when user triggers manual action

Closes #20261

See merge request !10494
 2017-05-06 17:17:02 +00:00
Kamil Trzciński 2e6201b131 Merge branch 'fix/gb/hide-environment-external-url-btn-when-not-provided' into 'master' 
Hide environment external URL button if not defined

Closes #30832

See merge request !11029
 2017-05-06 17:10:06 +00:00
Kamil Trzciński b7c480d7c0 Merge branch 'pages-0.4.2' into 'master' 
Use GitLab Pages v0.4.2

See merge request !11131
 2017-05-06 17:08:39 +00:00
Kamil Trzcinski aa440eb1c0
Single commit squash of all changes for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10878 
It's needed due to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10777 being merged with squash.
 2017-05-06 19:04:48 +02:00
Kamil Trzciński 8c9114683d Merge branch 'zj-real-time-pipelines' into 'master' 
Real time pipeline show action

Closes #25226

See merge request !10777
 2017-05-06 16:45:46 +00:00
Zeger-Jan van de Weg c17e6a6c68 Real time pipeline show action 2017-05-06 16:45:46 +00:00
Sean McGivern 1186dcabbf Merge branch 'fix-routable-find-by-full-path-on-mysql' into 'master' 
Fix `Routable.find_by_full_path` on MySQL

See merge request !11146
 2017-05-06 11:12:04 +00:00
Filipa Lacerda 8e6c4829d6 Merge branch '23751-add-contribution-graph-key-tooltips' into 'master' 
Add tooltips to user contribution graph key

Closes #23751

See merge request !11138
 2017-05-06 10:52:18 +00:00
Sean McGivern da0d8e0491 Fix `Routable.find_by_full_path` on MySQL 2017-05-06 09:45:25 +01:00
Sean McGivern 56fb7823f9 Merge branch '17361-redirect-renamed-paths' into 'master' 
Resolve "Redirect to new project link after a rename"

Closes #17361 and #30317

See merge request !11136
 2017-05-06 05:45:56 +00:00
Mike Greiling 22bd020028 add CHANGELOG.md entry for !11138 2017-05-05 22:43:11 -05:00
Mike Greiling b69bb08bf5 add tooltips to user contrib graph key 2017-05-05 22:41:53 -05:00
Stan Hu 6ce1df41e1 Merge branch 'use-absolute-path-for-gettext-config' into 'master' 
Use an absolute path for locale path in FastGettext config

See merge request !11141
 2017-05-06 03:31:49 +00:00
Stan Hu 62f856a3b5 Merge branch 'attemp-to-fix-issue_sidebar_spec-again' into 'master' 
Trigger click instead of actual click to make sure the right button is always hit

Closes #30504

See merge request !11127
 2017-05-06 02:23:34 +00:00
Stan Hu 58166f03b9 Merge branch 'fix/fork-spec-mysql' into 'master' 
Fix fork_spec failure to do with mySQL

Closes #31870

See merge request !11121
 2017-05-06 02:02:42 +00:00
Ruben Davila 61d0ac55d4 Use an absolute path for locale path in FastGettext config 
Unicorn was unable to start due to this bad config on Omnibus.
 2017-05-05 20:50:48 -05:00
Jacob Schatz a4c90a4195 Merge branch 'winh-visual-token-labels' into 'master' 
Colorize labels in issue search field

Closes #30467

See merge request !11047
 2017-05-05 22:47:35 +00:00
Winnie Hellmann b51f2a6080 Colorize labels in issue search field 2017-05-05 22:47:32 +00:00
Sean McGivern 9e041f2185 Merge branch '29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-gitlab-ce' into 'master' 
Generate and handle a gl_repository param to pass around components

Closes #29925

See merge request !10992
 2017-05-05 22:08:29 +00:00
Clement Ho cc9edff6dc Merge branch 'droplab-item-ignore-docs' into 'master' 
Include droplab-item-ignore in droplab docs

See merge request !10808
 2017-05-05 22:02:05 +00:00
Sean McGivern 143d88d5e6 Merge branch 'fix/admin-integrations' into 'master' 
Fix new admin integrations not taking effect on existing project

Closes #26376

See merge request !11069
 2017-05-05 22:01:43 +00:00
Jacob Schatz 3447b44a4a Merge branch '27614-fix-karma-ajax-fail' into 'master' 
Fix Karma failures for jQuery deferreds

See merge request !11134
 2017-05-05 21:41:56 +00:00
Kushal Pandya b801f414aa Fix Karma failures for jQuery deferreds 2017-05-05 21:41:55 +00:00
Michael Kozono b0ee22609a Reduce risk of deadlocks 
We’ve seen a deadlock in CI here https://gitlab.com/mkozono/gitlab-ce/builds/15644492#down-build-trace. This commit should not fix that particular failure, but perhaps it will avoid others.

* Don’t call delete_conflicting_redirects after update if the path wasn’t changed
* Rename descendants without using recursion again, so we can run delete_conflicting_redirects exactly once.
 2017-05-05 14:31:33 -07:00
Jacob Schatz 59a85c6b82 Merge branch 'add-sidebar-specs' into 'master' 
Add sidebar specs

See merge request !11132
 2017-05-05 21:26:37 +00:00
Sean McGivern 86e75ae092 Merge branch 'blackst0ne/gitlab-ce-add_system_note_for_editing_issuable' 2017-05-05 22:00:36 +01:00
Rubén Dávila Santos c1d5af67d3 Merge branch 'add-ruby-parser-dependency' into 'master' 
Add ruby_parser gem for all environments.

See merge request !11130
 2017-05-05 20:37:08 +00:00
Ruben Davila 61bc0c28c9 Merge branch 'add-ruby-parser-dependency' 2017-05-05 15:35:10 -05:00
Clement Ho f1d48c25a2 Fix failing spec and eslint 2017-05-05 14:45:21 -05:00
Jacob Schatz aa874a1cd6 Merge branch 'mia_backort' into 'master' 
Backport of Multiple Assignees feature

See merge request !11089
 2017-05-05 19:17:28 +00:00
Michael Kozono e1c245af51 Resolve discussions 2017-05-05 12:12:51 -07:00