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,651 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

51651 Commits

Author SHA1 Message Date
kushalpandya f66006169b Add Prometheus memory sparkline to MR widget 2017-05-09 19:30:22 +05:30
Sean McGivern 7ea12d8067 Merge branch 'mrchrisw-fix-slack-notify' into 'master' 
Fix notify_only_default_branch check for Slack service

See merge request !11154
 2017-05-09 08:18:48 +00:00
Jacob Schatz 8db76243ab Merge branch 'mr-widget-redesign-review' into 'master' 
Merge request widget redesign

Closes #25424 and #27950

See merge request !10319
 2017-05-09 04:15:36 +00:00
Fatih Acet 0151325dac Merge request widget redesign 2017-05-09 04:15:34 +00:00
Timothy Andrew 9ada13d343 Merge branch 'update-guides-for-9-2' into 'master' 
Update guides for 9.2

See merge request !11157
 2017-05-08 17:03:48 +00:00
Filipa Lacerda e98f12aff9 Merge branch '28794-standardize-jasmine-test-describe-block-names-that-test-specific-methods' into 'master' 
Resolve "Standardize jasmine test describe block names that test specific methods"

Closes #28794

See merge request !11137
 2017-05-08 15:28:53 +00:00
Dmitriy Zaporozhets 11ff9fc6a9 Merge branch '28359-skip-process-commit-worker-unless-issues-referenced' into 'master' 
Use regex to skip unnecessary reference processing in ProcessCommitWorker

Closes #28359

See merge request !10867
 2017-05-08 12:54:23 +00:00
Sean McGivern 1d0aa4806f Merge branch 'fix-notes_on_personal_snippets_spec-timeago-assertion-ce' into 'master' 
Fix notes_on_personal_snippets_spec

Closes #31938

See merge request !11160
 2017-05-08 12:16:15 +00:00
Sean McGivern 0b8bf5edbd Merge branch 'Add-index_redirect_routes_path_for_link-migration-to-setup_postgresql' into 'master' 
Add index_redirect_routes_path_for_link migration to setup_postgresql

See merge request !11165
 2017-05-08 11:51:26 +00:00
Phil Hughes c3d1bb0aee Merge branch 'winh-fix-ture-urls' into 'master' 
Use absolute URLs for fixtures

See merge request !11133
 2017-05-08 11:46:04 +00:00
Sean McGivern 09e2c1afb1 Merge branch 'sh-fix-almost-there-spec-mysql' into 'master' 
Fix sub-second timing comparison error for Devise confirmation period

Closes gitlab-ee#2362

See merge request !11156
 2017-05-08 11:06:54 +00:00
Luke "Jared" Bennett 4c25701dc6 Just assert the existence of the timeago element 2017-05-08 11:06:09 +00:00
Timothy Andrew e6b2baf216 Merge branch 'update-templates-for-9-2' into 'master' 
Update gitignore, dockerfile, and license templates for 9.2

See merge request !11158
 2017-05-08 10:46:24 +00:00
Sean McGivern ecd37af60b Merge branch 'document-foreign-keys' into 'master' 
Add documentation about adding foreign keys

See merge request !11117
 2017-05-08 10:40:11 +00:00
Luke "Jared" Bennett 7854824b8f Add index_redirect_routes_path_for_link migration to setup_postgresql.rake 2017-05-08 10:38:26 +00:00
Yorick Peterse b879079b1a
Add documentation about adding foreign keys 
[ci skip]
 2017-05-08 12:37:02 +02:00
Timothy Andrew 1fd409016a Update guides for 9.2. 
- Update the "Installation from Source" guide
- Create an update guide for `9.1` to `9.2`
 2017-05-08 10:29:08 +00:00
Timothy Andrew 2e36ed6608 Merge branch 'update-deps-licenses-for-9-2' into 'master' 
Update the vendor licenses file for 9.2

See merge request !11159
 2017-05-08 10:24:10 +00:00
Sean Packham (GitLab) 62b0eb2c0b Merge branch 'lm-improve-HA-docs' into 'master' 
clarify DB/Redis HA docs

See merge request !11094
 2017-05-08 09:20:22 +00:00
Luke "Jared" Bennett 17fc18ec2c Check for all possible timeago strings that can be rendered in a few minutes. We cannot rely on 'less than a minute ago' 2017-05-08 09:09:08 +00:00
Timothy Andrew 6db590a2f5 Update the vendor licenses file for 9.2. 2017-05-08 09:07:22 +00:00
Timothy Andrew a03f8f143d Update gitignore, dockerfile, and license templates for 9.2. 2017-05-08 09:02:14 +00:00
Sean Packham (GitLab) 6386e42f06 Merge branch 'docs/new-topic-issues' into 'master' 
New doc topic: issues

Closes #27650

See merge request !11075
 2017-05-08 08:35:40 +00:00
Marcia Ramos b13b22d04a New doc topic: issues 2017-05-08 08:35:38 +00:00
Phil Hughes 59c9ec5ce6 Merge branch '21393-allow-deletion-of-protected-branches' into 'master' 
Add confirm delete protected branch modal

Closes #21393

See merge request !11000
 2017-05-08 07:42:00 +00:00
Sam Rose 1ebd9dad8e Add confirm delete protected branch modal 2017-05-08 07:41:58 +00:00
James Lopez 1a5e84febe Merge branch 'fix/gl-project-id' into 'master' 
Omit gl_project_id from Import/Export

Closes #29813

See merge request !11032
 2017-05-08 06:52:01 +00:00
Chris Wilson 52c8651a6c Fix notify_only_default_branch check for Slack service 
The notify_only_default_branch property is using boolean_accessor
this means we need to check it using a question methods.
Also add specs for disabling this option.
 2017-05-08 15:55:02 +10:00
Stan Hu c175c30da7 Fix sub-second timing comparison error for Devise confirmation period 
On databases such as MySQL, it's possible to get into a timing comparison
error if the value of `Confirmable#confirmation_sent_at` is within a second
of `0.days.ago`. This is possible mostly in specs that test this behavior
and most likely not happening in practice. The result of this error causes
a user to be deemed active when it should be inactive. To prevent this
error, we explicitly check the configuration setting to be `0.days.ago`.

Closes gitlab-org/gitlab-ee#2362
 2017-05-07 22:11:09 -07:00
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