Commit Graph
19360 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets edd4ff28a9 Improve UI for list of changed files
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-01 12:44:55 +02:00
Jacob Vosmaer 8e05ee36f7 Merge branch 'migration-doc-update' into 'master'
Added troubleshooting to migration doc

@jacobvosmaer any thoughts?

See merge request !1482
2015-10-01 09:55:42 +00:00
Kamil Trzcinski bb6a39892d Update migration documentation 2015-10-01 11:34:29 +02:00
Dmitriy Zaporozhets 6ca5a258ca Update db schema
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-01 11:33:46 +02:00
Dmitriy Zaporozhets 82f1921165 Merge branch 'mr_improve_errors_handling' 2015-10-01 11:28:36 +02:00
Dmitriy Zaporozhets 58036d6847 Merge branch 'include-full-path-in-new-mr-page' into 'master'
Include full path of source and target branch names in New Merge Request page

The previous title on the New Merge Request page would only show the group name. which could be confusing. Before, if you attempted to create a new merge request within the repo, it might look like this:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/d300d3a362406628ffc7c8f2b5cc6b5d/image.png)

Since they are in the same repo, this MR just simplifies this to the branches:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/5d7b3efc2399b37f84ccfd42bd5d6e8d/image.png)

However, if you create a MR from a forked project, you now see the full namespace:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/7998c3d19e90d405f4634202cc7181c5/image.png)





Closes #2875

See merge request !1477
2015-10-01 09:24:46 +00:00
Dmitriy Zaporozhets 26d5eaff9b Merge branch 'project_moving' into 'master'
Note the original location of a moved project when notifying users of the move

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

See merge request !1463
2015-10-01 09:22:47 +00:00
Douwe Maan 2cb7a778a0 Merge branch 'rs-disable-signin-after-reset' into 'master'
Take advantage of `Devise.sign_in_after_reset_password`

Since we've updated our Devise dependency, we can take
advantage of this new-ish configuration setting and avoid
our hackish workaround.

See merge request !1475
2015-10-01 08:33:04 +00:00
Valery Sizov 5b57313051 Note the original location of a moved project when notifying users of the move 2015-10-01 09:54:56 +03:00
Valery Sizov 05fdd12fd9 Improve error message when merging fails 2015-10-01 09:45:47 +03:00
Stan Hu 5544d54793 Include full path of source and target branch names in New Merge Request page
Previous title would only show the group name, which could be confusing.

Closes #2875
2015-09-30 20:50:53 -07:00
Kamil Trzciński 2714d5b814 Merge branch 'update-docker' into 'master'
Update docker guide and add docker-compose.yml

/cc @JobV @sytses 


See merge request !1473
2015-09-30 18:43:34 +00:00
Robert Speicher 3a4274e19e Take advantage of Devise.sign_in_after_reset_password 2015-09-30 14:35:00 -04:00
Kamil Trzcinski f310c84b1d Fix typo 2015-09-30 19:54:56 +02:00
Kamil Trzcinski 54452412f7 Merge branch 'merge-ci-data' 2015-09-30 19:51:34 +02:00
Robert Speicher 0bf60630c0 Merge branch 'fix-view-admin-applications-text' into 'master'
Fixes english information paragraph in admin/applications view

See merge request !1470
2015-09-30 17:50:37 +00:00
Kamil Trzcinski 5a401523eb Fix migration 2015-09-30 19:43:29 +02:00
Diogo Resende bbb845b20b Adds newline at end of file 2015-09-30 17:28:06 +00:00
Diogo Resende 63a6259328 Adds missing plural form of applications of previous commit 2015-09-30 17:26:55 +00:00
Robert Speicher 2b9b20bc96 Merge branch 'apache-gghs-tcp' into 'master'
Apache needs gitlab-git-http-server on TCP

[ci skip]

See merge request !1462
2015-09-30 16:17:37 +00:00
Robert Speicher ecdee8772b Merge branch 'golang-ruby-versions' into 'master'
Bump Ruby and Golang versions

[ci skip]

See merge request !1467
2015-09-30 16:15:48 +00:00
Dmitriy Zaporozhets 048dd5e458 Merge branch 'merge-ci-data' into 'master'
Use data stored in projects instead of ci_projects

- It delegates name, path, gitlab_url, ssh_url_to_repo
- Remove ability to set this parameters using CI API

This fixes GitLab project rename, namespace change, repository rename, etc.

/cc @dzaporozhets 

See merge request !1404
2015-09-30 16:05:33 +00:00
Dmitriy Zaporozhets 247385a702 Merge branch 'fix-removed-file-in-diff' into 'master'
Fix bug when removed file was not appearing in merge request diff

Finally we can see removed files in merge request diff  

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

Fixes #2533 

See merge request !1471
2015-09-30 15:41:22 +00:00
Dmitriy Zaporozhets 1ca119930f Merge branch 'cleanup-ci-helpers' into 'master'
Cleanup ci helpers

Part of #2594

See merge request !1466
2015-09-30 14:07:04 +00:00
Kamil Trzciński 72b496b3a0 Merge branch 'fix-clear-crontab-in-ci-migration-guide' into 'master'
Add a missing RAILS_ENV=production to fix crontab clearing in the CI migration guide

All other commands in the guide set this env var, but it's missing for the `whenever --clear-crontab` call and this causes it to not clear the crontab properly.

See merge request !1474
2015-09-30 13:37:23 +00:00
Dimitar Dimitrov f4eaae5767 Add a missing RAILS_ENV=production to crontab clearing
All other commands in the guide set this env var, but it's missing here
and this causes whenever not to clear the crontab file of gitab_ci
properly.
2015-09-30 16:30:13 +03:00
Dmitriy Zaporozhets 46503b789d Fix invalid tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-30 15:29:52 +02:00
Kamil Trzcinski f9e5a30d03 Update docker guide and add docker-compose.yml 2015-09-30 14:24:39 +02:00
Kamil Trzcinski ad765353f6 Fix sometimes failing tests 2015-09-30 12:51:03 +02:00
Kamil Trzcinski b9ccc79cb5 Delegate ci_project parameters to projects
- It delegates name, path, gitlab_url, ssh_url_to_repo
- Remove ability to set this parameters using CI API

This fixes GitLab project rename, namespace change, repository rename, etc.
2015-09-30 12:48:40 +02:00
Dmitriy Zaporozhets fe7e97320c Fix bug when removed file was not appearing in merge request diff
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-30 12:31:23 +02:00
Dmitriy Zaporozhets f71f165f99 Fix CI mailer
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-30 11:16:00 +02:00
Dmitriy Zaporozhets 34431d8ecb Merge branch 'move-ci-settings' into 'master'
Move CI project settings page to CE project settings area

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

Part of #2594 

See merge request !1465
2015-09-30 08:49:46 +00:00
Diogo Resende e471356f76 Fixes english information paragraph in admin/applications view 2015-09-30 08:34:00 +00:00
Jacob Vosmaer 60b3055c0c Use Ruby 2.1.7 for new installs from source 2015-09-29 17:24:22 +02:00
Jacob Vosmaer 70460f7989 Use Golang 1.5.1 for new installs from source 2015-09-29 17:20:14 +02:00
Dmitriy Zaporozhets 3d9a7cdb4b Refactor CI helpers
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-29 16:26:40 +02: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 2e8a3e3996 Merge branch 'fix-link-to-projects-path-from-dashboard' into 'master'
Link directly to the projects page instead of the root controller

If "Your Projects' Activity" dashboard setting were selected, it would be impossible to navigate to the projects page since the redirection would always bounce back to the activity dashboard. 

Fixes bug introduced by !1446.


See merge request !1459
2015-09-29 13:33:09 +00:00
Dmitriy Zaporozhets 2c3355f958 Merge branch 'ci-commits-to-projects' into 'master'
Make Ci::Commits belong to Project instead of Ci::Project



See merge request !1455
2015-09-29 11:44:07 +00: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 3591afeef0 Apache needs gitlab-git-http-server on TCP 2015-09-29 13:37:07 +02: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
Kamil Trzcinski 0d877d91e7 Make ensure_gitlab_ci_project return ci_project or create a new one 2015-09-29 10:47:04 +02:00
Kamil Trzcinski 9498a40052 Fix migrations 2015-09-29 10:47:04 +02:00
Kamil Trzcinski 0f3deac362 Fix tests 2015-09-29 10:47:04 +02:00
Kamil Trzcinski 0fa4ab5fd8 Rename commits to ci_commits 2015-09-29 10:47:04 +02:00
Kamil Trzcinski e60647f011 Fix rubocop 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 8f8efcfa00 Fix tests 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 2c1f7ccac8 Fix register_build_service tests 2015-09-29 10:47:03 +02:00