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

59208 Commits

Author SHA1 Message Date
Mike Greiling 596fe67a03 Resolve "Monitoring graph date formatting is wrong" 2017-08-29 08:29:11 +00:00
Sean McGivern f0d22bb6f3 Merge branch '36114-stuck-mrs-job-follow-up' into 'master' 
Present enqueued merge jobs as "Merging" as well (https://gitlab.com/gitlab-org/gitlab-ce/issues/31207 follow-up)

Closes #36114

See merge request !13483
 2017-08-29 08:28:44 +00:00
Phil Hughes edd56aeaf4 Merge branch 'short-code' into 'master' 
Add styles for shorter code

See merge request !13612
 2017-08-29 08:05:42 +00:00
Jacob Schatz 1335ba6935 Add styles for shorter code 2017-08-29 08:05:41 +00:00
Phil Hughes c274da069d Merge branch '34413-move-convdev-index-location-to-after-cohorts' into 'master' 
Move ConvDev Index location to after Cohorts

Closes #34413

See merge request !13398
 2017-08-29 07:49:48 +00:00
Douwe Maan e599281e41 Merge branch 'rs-update-rubocop-gitlab-security' into 'master' 
Update rubocop-gitlab-security to 0.1.0

See merge request !13879
 2017-08-29 07:27:35 +00:00
Oswaldo Ferreira 86f43912fc Cleans merge_jid when possible on MergeService 2017-08-28 16:41:05 -03:00
Oswaldo Ferreira ffc576d7df Rename MergeRequest#async_merge to merge_async 2017-08-28 15:55:25 -03:00
Oswaldo Ferreira 9068083f86 Add changelog 2017-08-28 15:48:09 -03:00
Oswaldo Ferreira 4f17c6b763 Track enqueued and ongoing MRs 2017-08-28 15:48:09 -03:00
Oswaldo Ferreira d7f61bae8b Remove locked? check when unlocking a merge request 
Our state machine shall have enough knowledge to not allow states other
than locked from transitioning to opened (e.g. MergeRequest#unlock_mr).
 2017-08-28 15:48:09 -03:00
Fatih Acet 6f0f65becb Merge branch '36582-fix-note-resolved-icon' into 'master' 
Update and fix resolvable note icons for easier recognition

Closes #36582

See merge request !13821
 2017-08-28 18:30:26 +00:00
Stan Hu 5f88660a3f Merge branch 'zj-update-templates-with-warning-header' into 'master' 
Update templates to include header in the README

Closes #36904

See merge request !13785
 2017-08-28 17:44:45 +00:00
Jose Ivan Vargas fed2623dfd Update CHANGELOG.md for 9.5.2 
[ci skip]
 2017-08-28 12:27:01 -05:00
Douwe Maan b3a52448bb Merge branch 'rs-transient-mini-pipeline-graph-failure' into 'master' 
Fix a transient failure in mini_pipeline_graph_spec

Closes #34323

See merge request !13844
 2017-08-28 17:25:34 +00:00
Clement Ho 1a09c20700 Merge branch 'group-mr-search-bar' into 'master' 
Add filtered search to group merge requests dashboard

Closes #36703

See merge request !13688
 2017-08-28 17:24:20 +00:00
Robert Speicher df677647b8 Merge branch 'sh-add-spec-to-protected-tags-deletion' into 'master' 
Add spec for deleting protected tags

See merge request !13693
 2017-08-28 17:18:30 +00:00
Sean McGivern fde6047990 Merge branch 'fix/import-events' into 'master' 
Fix events error importing GitLab projects

Closes #36965

See merge request !13868
 2017-08-28 16:56:03 +00:00
Robert Speicher bed27b6a6d Update rubocop-gitlab-security to 0.1.0 2017-08-28 12:46:00 -04:00
Robert Speicher 8d72f09730 Fix a transient failure in mini_pipeline_graph_spec 
This spec failed reliably with a specific run order (see issue), the
reasons for which are still unknown. This simplification resolves the
failure.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/34323
 2017-08-28 12:08:06 -04:00
Robert Speicher 3e0757f2d2 Merge branch 'sh-improve-flaky-ace-editor-spec' into 'master' 
Improve flaky ACE editor spec

See merge request !13854
 2017-08-28 16:05:03 +00:00
Robert Speicher 3dd1efe6fc Merge branch 'fix-flakes' into 'master' 
fix transient dropdown test failures

Closes #37052 and #34436

See merge request !13862
 2017-08-28 15:58:21 +00:00
James Lopez 40819467b9 fix typo 2017-08-28 17:11:28 +02:00
Sean McGivern 7ccef75a26 Merge branch '36061-mr-ref' into 'master' 
Instrument MergeRequest#ensure_ref_fetched

See merge request !13876
 2017-08-28 14:35:05 +00:00
James Lopez 49495fe63d fix spec 2017-08-28 15:24:24 +02:00
James Lopez eef5135e08 Fix events error importing GitLab projects 2017-08-28 15:24:24 +02:00
Jarka Kadlecova 7ba19ab620 Instrument MergeRequest#ensure_ref_fetched 2017-08-28 15:21:34 +02:00
Douwe Maan 7dbb86783d Merge branch 'mk-reenable-mysql-tests-on-all-branches' into 'master' 
Reenable MySQL tests on all CE and EE branches part 2

Closes #36384

See merge request !13840
 2017-08-28 12:29:21 +00:00
Douwe Maan 0b73771205 Merge branch '36792-inline-user-refresh-when-creating-project' into 'master' 
Don't wait for project authorization sidekiq jobs when creating projects

Closes #36792

See merge request !13775
 2017-08-28 12:21:17 +00:00
Douwe Maan ed1ca47c9e Merge branch 'rs-aggregate-system-note-specs' into 'master' 
Combine multiple expectations into one for shared system note example

See merge request !13814
 2017-08-28 12:17:05 +00:00
Sean McGivern 58bddf28a7 Merge branch 'fix/gb/clear-schema-cache-after-running-migration-tests' into 'master' 
Clear schema cache after running tests for migrations

Closes #37086

See merge request !13870
 2017-08-28 12:16:03 +00:00
Douwe Maan f03705f01b Merge branch 'rs-remove-filtered-issues-skips' into 'master' 
Remove skipped examples in filtered issues feature spec

See merge request !13845
 2017-08-28 12:15:48 +00:00
Kamil Trzciński 1498baf7e9 Merge branch '35642-add-owner-to-triggers-factory' into 'master' 
Make sure we have an owner for triggers

Closes #35642

See merge request !13799
 2017-08-28 11:09:01 +00:00
Grzegorz Bizon db4bd1a67d Clear schema cache after running tests for migrations 2017-08-28 12:49:43 +02:00
Douwe Maan 073811074b Merge branch 'sh-simplify-system-hook-testing' into 'master' 
Simplify system hook testing and guarantee test will fire

Closes #37067

See merge request !13858
 2017-08-28 10:38:52 +00:00
Sean McGivern 891d90a923 Merge branch 'bugfix.notify-custom-participants' into 'master' 
Bugfix.notify custom participants

Closes #36610

See merge request !13680
 2017-08-28 10:12:41 +00:00
Achilleas Pipinellis 9ce1f486bc Merge branch 'docs/update-ci-docker-using-docker-images' into 'master' 
Update 'Using Docker images' documentation

Closes gitlab-ci-multi-runner#2696

See merge request !13848
 2017-08-28 10:10:12 +00:00
Tomasz Maczukin 6c4d13fe65 Update 'Using Docker images' documentation 2017-08-28 10:10:11 +00:00
Grzegorz Bizon d1eda393f2 Merge branch 'backstage/gb/rename-ci-cd-processing-sidekiq-queues' into 'master' 
Rename CI/CD related Sidekiq queues

Closes #35532

See merge request !13714
 2017-08-28 10:08:02 +00:00
Yorick Peterse 922eb6d331 Merge branch 'jej/remove-dependent-destroy-from-protected-refs' into 'master' 
Remove 'dependent: :destroy' from ProtectedRef has_many :"#{type}_access_levels"

See merge request !13835
 2017-08-28 09:57:02 +00:00
Lin Jen-Shin ed4f5b97d3 Merge remote-tracking branch 'upstream/master' into 35642-add-owner-to-triggers-factory 
* upstream/master: (49 commits)
  Fire system hooks when a user is created via LDAP or OAuth
  Common Docker Documentation Location in `gitlab-ce`
  fix deprecation warning present during webpack compiles
  Enable 5 lines of Sidekiq backtrace lines to aid in debugging
  Add support for copying permalink to notes via more actions dropdown
  Docs: update - fix headers
  Handle creating a nested group on MySQL correctly
  Decrease statuses batch size even more in a migration
  Fix failure when issue author is nil
  Fix searching for files by path
  Fix invite by email address duplication
  Revert "Merge branch 'mk-reenable-mysql-tests-on-all-branches' into 'master'"
  Fix repo editor scrollbar
  Revert "Merge branch 'sh-sidekiq-backtrace' into 'master'"
  Replace 'source/search_code.feature' spinach test with an rspec analog
  Add missing third argument to `Git::Repository#initialize` in spec
  New doc: how to install GitLab on Azure
  Authorizations regarding OAuth - style confirmation
  Enable 5 lines of Sidekiq backtrace lines to aid in debugging
  Reenable MySQL tests on all branches
  ...
 2017-08-28 15:36:29 +08:00
Lin Jen-Shin 45aa23a6d1 Remove duplicate update for owner 2017-08-28 15:36:07 +08:00
Simon Knox bcd2135e08 fix transient test failures caused by wrong dropdown trigger 2017-08-28 16:38:26 +10:00
Stan Hu 1e53f40c25 Simplify system hook testing and guarantee test will fire 
The change in !11728 would cause an arbitrary project to be chosen to test
system hooks, and it's likely that the project would not have any commits or
relevant commits to test the hook. This would prevent admins from verifying
that the hook fired. Instead of trying to create a representative hook
dynamically, just send static data to guarantee the hook will actually be
tested.

Closes #37067
 2017-08-27 15:50:20 -07:00
Hiroyuki Sato 5e0b1442f0 Add changelog entry 2017-08-28 06:16:14 +09:00
Hiroyuki Sato e19c560d78 Add a simple spec that checks filtered search works at group merge request page 2017-08-27 15:42:35 +09:00
Grzegorz Bizon ef8eb3f6f7 Merge branch 'sh-system-hooks-ldap-users' into 'master' 
Fire system hooks when a user is created via LDAP or OAuth

Closes #37073

See merge request !13846
 2017-08-27 04:54:22 +00:00
Stan Hu e6c13d2954 Improve flaky ACE editor spec 
The ACE editor JavaScript may not be loaded when the spec
runs evaluateScript. Wait for the editor to load before
attempting to run ACE-specific JavaScript.
 2017-08-26 12:51:47 -07:00
Grzegorz Bizon 15ace6a910 Merge commit '2be34630623711fc20ef8c101b5cef688f207cc1' into backstage/gb/rename-ci-cd-processing-sidekiq-queues 
* commit '2be34630623711fc20ef8c101b5cef688f207cc1':
  Common Docker Documentation Location in `gitlab-ce`
  fix deprecation warning present during webpack compiles
  Enable 5 lines of Sidekiq backtrace lines to aid in debugging
  Add support for copying permalink to notes via more actions dropdown
  Handle creating a nested group on MySQL correctly
  Decrease statuses batch size even more in a migration
  Fix repo editor scrollbar
  Replace 'source/search_code.feature' spinach test with an rspec analog
  Authorizations regarding OAuth - style confirmation
  Update README.md
  Refactor complicated API group finding rules into GroupsFinder
  Fix group and project search for anonymous users
  Document version Group Milestones API introduced
  Allow v4 API GET requests for groups to be unauthenticated
  Adjust a range and a size in stages statuses migration
  Update README.md
  Point to /developers on docs/administration/authentiq.md
  Indexes GFM markdown guide
  use inline links instead of referenced
  Add index on ci_runners.contacted_at
 2017-08-26 10:55:20 +02:00
Stan Hu e94a2fde0d Fire system hooks when a user is created via LDAP or OAuth 
Closes #37073
 2017-08-25 22:00:07 -07:00