Commit Graph

1491 Commits

Author SHA1 Message Date
Douwe Maan 3420c6cc4e Merge branch 'master' into orderable-issues 2017-03-07 16:39:52 -06:00
Yorick Peterse e714d569f3 Merge branch 'dm-add-concurrent-index-cop' into 'master'
Add cop to ensure reversibility of add_concurrent_index

See merge request !9771
2017-03-07 20:06:13 +00:00
Kamil Trzciński 57e709757f Merge branch 'zj-variables-build-job' into 'master'
Rename BUILD to JOB in CI Variables

Closes #29053

See merge request !9756
2017-03-07 18:45:03 +00:00
Douwe Maan e3ddd87102 Add downtime constants 2017-03-07 12:14:31 -06:00
Sean McGivern a5db7f5425 Merge branch '28447-hybrid-repository-storages' into 'master'
Update storage settings to allow extra values per shard

See merge request !9597
2017-03-07 16:55:03 +00:00
Sean McGivern de37dcee90 Merge branch 'siemens/gitlab-ce-feature/openid-connect' 2017-03-07 16:16:08 +00:00
Douwe Maan 5d9762b3b5 Add cop to ensure reversibility of add_concurrent_index 2017-03-07 10:09:01 -06:00
Douwe Maan 6a52cda31d Merge remote-tracking branch 'origin/personal_access_token_api_and_impersonation_token' 2017-03-07 09:29:55 -06:00
Z.J. van de Weg 9c25404ac0 Rename BUILD to JOB in CI Variables
Given GitLab moves away from using the term build, everywhere, also the
CI variables are being renamed.

For now, both `CI_BUILD_X` and `CI_JOB_X` are supported, with the same
values. However, in about 3 months, support will be dropped.
2017-03-07 15:41:13 +01:00
Markus Koller c498289048 Implement OpenID Connect identity provider 2017-03-07 14:54:35 +01:00
Valery Sizov 1497db75f5 Fix AddRelativePositionToIssues migration 2017-03-07 15:29:30 +02:00
Valery Sizov a8cf2e8d54 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues 2017-03-07 13:42:45 +02:00
Filipa Lacerda 0ec62b6c5d Merge branch '26371-native-emojis-v3' into 'master'
Add emoji images - Base Native Unicode Emojis

Closes #26371

See merge request !9569
2017-03-07 02:34:48 +00:00
Eric Eastwood 96cbad2337 Fix up @DouweM review 2017-03-06 15:19:33 -06:00
Douwe Maan d617182a1a Merge branch 'master' into 'rs-carrierwave-db'
# Conflicts:
#   spec/models/group_spec.rb
2017-03-06 21:13:27 +00:00
Kamil Trzciński b70d151db9 Merge branch 'zj-create-mattermost-team' into 'master'
Create Mattermost Team from GitLab

Closes #23964

See merge request !8746
2017-03-06 20:02:52 +00:00
Robert Speicher 4c622b71fd Add Upload model and UploadChecksumWorker worker 2017-03-06 14:41:09 -05:00
Tiago Botelho 005749a616 apply codestyle and implementation changes to the respective feature code 2017-03-06 19:18:26 +00:00
Kamil Trzciński 79b8f02bb1 Merge branch 'pipeline-blocking-actions' into 'master'
Make manual actions blocking

Closes #26360 and #22628

See merge request !9585
2017-03-06 19:16:01 +00:00
Grzegorz Bizon 3b35d1f8c1 Migrate legacy actions in post deployment migration 2017-03-06 18:24:55 +01:00
Valery Sizov 710e4df933 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues 2017-03-06 18:50:59 +02:00
Pawel Chojnacki 70b9d8da4c Remove unecessary defaults for uniq ip block, cleanup refactoring leftovers 2017-03-06 15:45:43 +01:00
Pawel Chojnacki 8a9bc24ef8 align schema.rb with upstream and fix rubocop warning about not freezing mutable constants and empty error classes 2017-03-06 15:41:50 +01:00
Pawel Chojnacki 0ef8a64348 Remove unecessary calls to limit_user!, UniqueIps Middleware, and address MR review
- cleanup formating in haml
 - clarify time window is in seconds
 - cleanup straneous chunks in db/schema
 - rename count_uniqe_ips to update_and_return_ips_count
 - other
2017-03-06 15:41:25 +01:00
Pawel Chojnacki e5cf3f51fb Allow limiting logging in users from too many different IPs. 2017-03-06 15:41:24 +01:00
Grzegorz Bizon 07539ab2b0 Merge branch 'master' into pipeline-blocking-actions
* master: (26 commits)
  Fix UserBasic
  Rename `/take` to `/take_ownership`, expose `owner` in `v3`.
  Update after review
  Fix values being called at Array instead of Hash
  Fix json response in branches controller
  Improve docs and specs related to pages artifacts
  Add MR fo changelog about removing pages artifacts
  Delete artifacts for pages unless expiry date is specified
  Lint doc
  Improved team selection
  Move foreign key to separate migration
  Fix import model attributes
  Update documentation and expose ID
  Introduce tests for pipeline triggers
  Fix trigger model
  Update db/schema
  Make triggers to be user aware
  Make Pipeline Triggers to be user aware
  Update triggers API
  Remove remnants of git annex
  ...

Conflicts:
	db/schema.rb
2017-03-06 15:11:28 +01:00
Zeger-Jan van de Weg 77d0de9102 Merge branch 'master' into 'zj-create-mattermost-team'
# Conflicts:
#   db/schema.rb
2017-03-06 14:04:14 +00:00
Grzegorz Bizon 3788f5face Add migration for manual actions with skipped status 2017-03-06 10:50:35 +01:00
Z.J. van de Weg 449ecd6c68 Merge branch 'master' into zj-create-mattermost-team 2017-03-06 08:55:35 +01:00
Z.J. van de Weg b3aae422a6 Minor edits, incorporate review 2017-03-06 08:55:30 +01:00
Kamil Trzcinski e4a9b8a9e1
Move foreign key to separate migration 2017-03-05 21:41:29 +01:00
Kamil Trzcinski 4ac1467c5c
Update db/schema 2017-03-05 18:53:09 +01:00
Kamil Trzcinski 91ce04678e
Make triggers to be user aware 2017-03-05 18:53:00 +01:00
Kamil Trzcinski 0a75de2909
Make Pipeline Triggers to be user aware
- they can have owner,
- they can be edited,
- they have description,
- you can take ownership of them
2017-03-05 18:52:41 +01:00
Valery Sizov 5bf2ab73ba Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues 2017-03-03 20:24:16 +02:00
Alejandro Rodríguez 0b9d56f960 Update storage settings to allow extra values per shard
This will be necessary when adding gitaly settings. This version
doesn't make any functional changes, but allows us to include this
breaking change in 9.0 and add the needed extra settings in the future
with backwards compatibility
2017-03-03 12:13:30 -03:00
Robert Speicher a0ab45d0c3 Fix the `Gitlab::Seeder` monkey patch to disable mail delivery 2017-03-02 20:29:30 -05:00
Valery Sizov b64020de28 Satisfy rubocop 2017-03-02 16:58:41 +02:00
Z.J. van de Weg ddfd09c09c Merge branch 'master' into zj-create-mattermost-team 2017-03-02 10:22:56 +01:00
Z.J. van de Weg 52c4a7866e Improve UX 2017-03-02 10:21:29 +01:00
Douwe Maan 7e2ad5d47a Merge branch 'fix/mwbs-to-mwps' into 'master'
Rename MWBS to MWPS

Closes #24707

See merge request !9335
2017-03-01 20:30:51 +00:00
Rémy Coutable 2f40fc521e
Disable the inheritance column of services in DisableInvalidServiceTemplates migration
The `unless defined?(Service)` was useless since in production env,
models are eager loaded, thus we wouldn't disable the STI, resulting in
the following error:

The single-table inheritance mechanism failed to locate the subclass:
'GitlabCiService'. This error is raised because the column 'type' is
reserved for storing the class in case of inheritance. Please rename
this column if you didn't intend it to be used for storing the
inheritance class or overwrite Service.inheritance_column to use another
column for that
information./opt/gitlab/embedded/service/gitlab-rails/db/post_migrate/20170211073944_disable_invalid_service_templates.rb:11:in `up'

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-01 14:06:50 +01:00
James Lopez a0101ebf84 Update occurrences of MWBS to MWPS
Rename column in the database
 Rename fields related to import/export feature
 Rename API endpoints
 Rename documentation links
 Rename the rest of occurrences in the code
 Replace the images that contain the words "build succeeds" and docs referencing to them
 Make sure pipeline is green and nothing is missing.

updated doc images

renamed only_allow_merge_if_build_succeeds in projects and fixed references

more updates

fix some spec failures

fix rubocop offences

fix v3 api spec

fix MR  specs

fixed issues with partials

fix MR spec

fix alignment

add missing v3 to v4 doc

wip - refactor v3 endpoints

fix specs

fix a few typos

fix project specs

copy entities fully to V3

fix  entity error

more fixes

fix failing specs

fixed missing entities in V3 API

remove comment

updated code based on feedback

typo

fix spec
2017-03-01 12:02:02 +01:00
Tiago Botelho 9f2e4742e3 applies relevant changes to the code and code structure 2017-02-28 22:15:40 +00:00
Simon Vocella a3dfb58e7f add impersonation token 2017-02-28 22:15:39 +00:00
Simon Vocella 81246e5649 manage personal_access_tokens through api 2017-02-28 22:15:39 +00:00
Valery Sizov 8708347c24 Recover db/schema.rb 2017-02-28 20:48:40 +02:00
Valery Sizov e097cf43da Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues 2017-02-28 20:38:15 +02:00
Ruben Davila eb90e3278a Fix migration without DOWNTIME clause specified 2017-02-28 01:11:54 -05:00
Dmitriy Zaporozhets 74faf4ca51
Add development fixtures for nested groups
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-02-27 17:28:53 +02:00