Commit Graph
1234 Commits
Author SHA1 Message Date
Douwe Maan bf23ce191b Enable arbitration in MailRoom 2015-10-11 18:17:49 +02:00
Robert Speicher 5e01e1bb90 Use methods: :any in our rack-cors configuration
This was added in rack-cors 0.4.0 and allows all types of CORS requests
to the API.
2015-10-07 22:08:37 -04:00
Robert Speicher c670f07366 Merge branch 'clarify-postfix' into 'master'
Clarify Reply by email settings when using Postfix mail server

Fixes #2902.

[ci skip]

See merge request !1528
2015-10-07 19:59:57 +00:00
Dmitriy Zaporozhets 030b5038b1 Merge branch 'cleanup-ci-pages' into 'master'
Cleanup CI pages

- [x] Remove `ci/projects/:id` page
- [x] Remove Continuous integration from project menu
- [x] Remove unused css/js
- [x] Remove Ci::Commit and Ci::Build controllers
- [x] Move CI services to project settings area


cc @ayufan 

Part of #2594

See merge request !1529
2015-10-07 17:04:54 +00:00
Dmitriy Zaporozhets 7f63a8787c Fix tests and few CI features
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-07 17:54:49 +02:00
Dmitriy Zaporozhets a30b68fe1d Move CI services to project settings area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-07 16:20:31 +02:00
Dmitriy Zaporozhets 1e06cabf4a Remove Ci::Commit and Ci::Build controllers
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-07 15:24:32 +02:00
Stan Hu 0ab6ca93aa Add directory feature button
Change "+" icon under "Files" section to have three options:

* Create file
* Upload file
* New directory

Upload file is no longer accessible from the "Create file" page.
Users can now select a target branch in upload file as well.

Closes #2799: Fixes a bug where file modes were overwritten after a commit

Closes https://github.com/gitlabhq/gitlabhq/issues/8253: Existing files
can no longer be overwritten in the "Create file" section.

Closes #2557
2015-10-07 04:22:55 -07:00
Douwe Maan f9aab3fb58 Clarify Reply by email settings when using Postfix mail server 2015-10-07 11:43:38 +02:00
Dmitriy Zaporozhets 04c7dc2a9e Cleanup CI code after refactoring and fix several 500 errors
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-06 20:15:06 +02:00
Dmitriy Zaporozhets f6223ffb31 Move CI build page to CE project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-06 19:34:21 +02:00
Dmitriy Zaporozhets 697b34d786 Render CI statuses on commit page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-06 16:10:17 +02:00
Kamil Trzcinski f088ffe8f7 Merge branch 'rs-remove-ci-disable'
See merge request !1512
2015-10-05 20:06:31 +02:00
Kamil Trzciński 3eef0e18e0 Merge branch 'refactor-build-service' into 'master'
Refactor Ci::Commit and Ci::Build to have all builds for same :sha on single page

This makes Ci::Commit to have only :sha and simplifies routing to have only :sha in path. The :ref and :push_data is now parameter of Ci::Build.

All commit related data (git author, message and .gitlab-ci.yml) is read directly from repository.

All code related for creating builds is moved to CreateBuildsService.

Status deduction is rewritten to make if more efficient and easier to integrate with Commit Status API.

This is partially working, tests are not yet touched.

This slightly changes view of Commit:
![Screen_Shot_2015-10-02_at_15.21.47](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ad3f1ccdcc87659ea437d8db6c5b9f94/Screen_Shot_2015-10-02_at_15.21.47.png)

@dzaporozhets What do you think?


See merge request !1502
2015-10-05 17:42:50 +00:00
Robert Speicher fc59c45d58 Remove the option to disable CI
This option only existed to ease the CI-to-CE/EE migration process.

This commit partially reverts 8b05abe816
2015-10-05 12:23:38 -04:00
Dmitriy Zaporozhets c293cc9152 Move CI web hooks page to project settings area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-05 10:47:23 +02:00
Kamil Trzcinski 546a3c6561 Refactor commit and build 2015-10-05 09:52:35 +02:00
Douwe Maan 93522e59ec Merge branch 'rs-throttle-reset' into 'master'
Throttle "Forgot your password?" emails

Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2611

See merge request !1476
2015-10-02 14:37:07 +00:00
Robert Speicher c7b43126bd Add recently_reset message to Devise translations 2015-10-01 21:46:51 -04:00
Robert Speicher 19748ddee6 Update config/locales/devise.en.yml with latest version
It looks like a lot of changes but it's not, they just sorted it
alphabetically.
2015-10-01 21:38:39 -04:00
Dmitriy Zaporozhets 3fa8bd0e67 Merge branch 'ee_features_in_example_config' into 'master'
Removes reference to Enterprise Edition ssh key sync feature.

fixes #2042

See merge request !1017
2015-10-01 15:12:24 +00:00
Robert Speicher 3a4274e19e Take advantage of Devise.sign_in_after_reset_password 2015-09-30 14:35:00 -04:00
Dmitriy Zaporozhets 87240e989b Move CI project settings page to CE project settings area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-29 16:07:44 +02:00
Dmitriy Zaporozhets bdf4668586 Merge branch 'move-triggers-page' into 'master'
Move CI triggers page to project settings area

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Part of #2594 

See merge request !1461
2015-09-29 11:43:27 +00:00
Jacob Vosmaer 958af6f5c2 Merge branch 'master' into 'master'
Add support for AWS S3 Server-Side Encryption support

This adds support for AWS S3 SSE with S3 managed keys, this means the
data is encrypted at rest and the encryption is handled transparently to
the end user as well as in the AWS Console.

## Points to double check
I'm unsure on the best way to the handle the default. I've followed the `multipart_upload` de facto in the app. I'm happy to change this if required or if it will impact elsewhere e.g. omnibus packages

I also think I've managed to catch all of the documentation for this change as well.

### Why is this required
Many enterprises require good backup support but also for this to be encrypted. By default backups aren't encrypted, this allows at rest encryption to be supported in GitLab backups providing a layer of security should the physical media not be properly disposed of.

Relates to issue #2478.


See merge request !1280
2015-09-29 10:31:42 +00:00
Dmitriy Zaporozhets 2a0d4e7200 Move CI triggers page to project settings area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-29 10:37:31 +02:00
Dmitriy Zaporozhets 037defc7de Move CI variables page to project settings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-28 17:19:20 +02:00
Dmitriy Zaporozhets b656419591 Merge branch 'move-runners-page' 2015-09-28 16:47:18 +02:00
Douwe Maan 1c1c7e1abd Merge branch 'fxposter/gitlab-ce-login-from-admin' 2015-09-28 15:43:02 +02:00
Paul Beattie 253d2320ab Add support for AWS S3 Server-Side Encryption support
This adds support for AWS S3 SSE with S3 managed keys, this means the
data is encrypted at rest and the encryption is handled transparently to
the end user as well as in the AWS Console. This is optional and not
required to make S3 uploads work.
2015-09-25 17:06:31 +01:00
Dmitriy Zaporozhets b328c76c06 Move runners page to project settings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-25 18:03:41 +02:00
Pavel Forkert eb9528b8b9 Move login button to user page, switched to POST method 2015-09-24 16:34:04 +03:00
Douwe Maan 477017722b Add and document option to use StartTLS with mail_room. 2015-09-24 15:15:25 +02:00
Pavel Forkert 83347954fc Add option to admin area to sign in as a specific user
Closes #2291
2015-09-24 16:14:16 +03:00
Dmitriy Zaporozhets eae27d1ecb Move CI charts to project graphs area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-23 16:24:46 +02:00
Robert Speicher d4a960161e Merge branch 'rename-reply-by-email' into 'master'
Rename reply_by_email to incoming_email to prepare for the future.

Closes #2579.

See merge request !1367
2015-09-21 18:52:13 +00:00
Sytse Sijbrandij 534bd0f87d Fix grammar 2015-09-21 16:43:43 +00:00
Douwe Maan ee028d9d60 Rename reply_by_email to incoming_email to prepare for the future. 2015-09-21 10:35:37 +02:00
Sameer Naik 01c0d14e41 fixes link to reply_by_email docs 2015-09-20 11:25:09 +05:30
Valery SizovandKamil Trzcinski a0c1a12dee remove API calls from CE to CI 2015-09-18 18:02:11 +02:00
Dmitriy Zaporozhets ac571623d8 Merge branch 'pg_dump_schema' into 'master'
Add pg_schema to backup config

https://dev.gitlab.org/gitlab/gitlabhq/issues/2489

See merge request !1345
2015-09-18 14:33:35 +00:00
Valery Sizov d7242054ba add pg_schema to backup config 2015-09-18 16:29:13 +03:00
Kamil Trzcinski e41a29b0c3 Allow to disable GitLab CI 2015-09-18 12:46:47 +02:00
Kamil Trzcinski 7166f7b7cf Remove CI help 2015-09-17 17:09:10 +02:00
Robert Speicher 09bcce7d1f Merge branch 'ldap-attributes' into 'master'
Allow configuration of LDAP attributes GitLab will use for the new user account.

Fixes #2412.

See merge request !1261
2015-09-16 18:34:55 +00:00
Kamil Trzcinski 1b464bfe03 Update documentation and config files 2015-09-16 00:28:59 +02:00
Kamil Trzcinski e21deaee8e Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
# Conflicts:
#	Gemfile.lock
2015-09-15 22:40:35 +02:00
Stan Hu 81e741af24 Merge pull request #9138 from liyakun/master
add "replace" and "upload" functionality
2015-09-14 17:57:41 -07:00
liyakun e2ece2bc35 Add "Replace" and "Upload" features
Refactor upload and replace functionality

    Rename file and move CSS

    Fix typo

    Make dropzone a div

    Remove unnecessary file

    Change color of "upload existing one"

    Add missing changes
2015-09-15 02:12:56 +02:00
Kamil Trzcinski 95037c9c55 Revert "monkey patch of Hash"
This reverts commit 6014019ed4.
2015-09-14 11:27:30 +02:00