summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rs-remove-ci-disable'Kamil Trzcinski2015-10-051-1/+0
|\ | | | | | | See merge request !1512
| * Remove the option to disable CIrs-remove-ci-disableRobert Speicher2015-10-051-1/+0
| | | | | | | | | | | | This option only existed to ease the CI-to-CE/EE migration process. This commit partially reverts 8b05abe816b0c681ac218096b294311dd04fde8b
* | Merge branch 'refactor-build-service' into 'master' Kamil Trzciński2015-10-051-6/+4
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Refactor commit and buildKamil Trzcinski2015-10-051-6/+4
| |
* | Move CI web hooks page to project settings areaDmitriy Zaporozhets2015-10-051-6/+5
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'rs-throttle-reset' into 'master' Douwe Maan2015-10-021-51/+53
|\ | | | | | | | | | | | | Throttle "Forgot your password?" emails Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2611 See merge request !1476
| * Add recently_reset message to Devise translationsRobert Speicher2015-10-011-0/+1
| |
| * Update config/locales/devise.en.yml with latest versionRobert Speicher2015-10-011-51/+52
| | | | | | | | | | It looks like a lot of changes but it's not, they just sorted it alphabetically.
* | Merge branch 'ee_features_in_example_config' into 'master' Dmitriy Zaporozhets2015-10-011-1/+0
|\ \ | |/ |/| | | | | | | | | Removes reference to Enterprise Edition ssh key sync feature. fixes #2042 See merge request !1017
| * Removes reference to Enterprise Edition ssh key sync feature.Ted Strzalkowski2015-07-211-1/+0
| |
* | Take advantage of `Devise.sign_in_after_reset_password`rs-disable-signin-after-resetRobert Speicher2015-09-301-0/+4
| |
* | Move CI project settings page to CE project settings areamove-ci-settingsDmitriy Zaporozhets2015-09-291-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'move-triggers-page' into 'master' Dmitriy Zaporozhets2015-09-291-2/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Move CI triggers page to project settings area Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Part of #2594 See merge request !1461
| * | Move CI triggers page to project settings areamove-triggers-pageDmitriy Zaporozhets2015-09-291-2/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'master' into 'master' Jacob Vosmaer2015-09-292-14/+17
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Add support for AWS S3 Server-Side Encryption supportPaul Beattie2015-09-252-14/+17
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Move CI variables page to project settingsmove-variables-pageDmitriy Zaporozhets2015-09-281-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'move-runners-page'Dmitriy Zaporozhets2015-09-281-8/+7
|\ \ \
| * | | Move runners page to project settingsDmitriy Zaporozhets2015-09-251-8/+7
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'fxposter/gitlab-ce-login-from-admin'Douwe Maan2015-09-281-0/+1
|\ \ \ | |/ / |/| |
| * | Move login button to user page, switched to POST methodPavel Forkert2015-09-241-1/+1
| | |
| * | Add option to admin area to sign in as a specific userPavel Forkert2015-09-241-0/+1
| | | | | | | | | | | | Closes #2291
* | | Add and document option to use StartTLS with mail_room.Douwe Maan2015-09-241-0/+2
|/ /
* | Move CI charts to project graphs areaDmitriy Zaporozhets2015-09-231-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'rename-reply-by-email' into 'master' Robert Speicher2015-09-212-6/+6
|\ \ | | | | | | | | | | | | | | | | | | Rename reply_by_email to incoming_email to prepare for the future. Closes #2579. See merge request !1367
| * | Rename reply_by_email to incoming_email to prepare for the future.Douwe Maan2015-09-212-5/+5
| | |
* | | Fix grammarSytse Sijbrandij2015-09-211-2/+2
|/ /
* | fixes link to reply_by_email docsSameer Naik2015-09-201-1/+1
| |
* | remove API calls from CE to CIci_closer_integrationValery Sizov2015-09-181-1/+0
| |
* | Merge branch 'pg_dump_schema' into 'master' Dmitriy Zaporozhets2015-09-182-0/+2
|\ \ | | | | | | | | | | | | | | | | | | Add pg_schema to backup config https://dev.gitlab.org/gitlab/gitlabhq/issues/2489 See merge request !1345
| * | add pg_schema to backup configpg_dump_schemaValery Sizov2015-09-182-0/+2
| | |
* | | Allow to disable GitLab CIKamil Trzcinski2015-09-182-1/+2
|/ /
* | Remove CI helpKamil Trzcinski2015-09-171-4/+0
| |
* | Merge branch 'ldap-attributes' into 'master'Robert Speicher2015-09-162-1/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | Allow configuration of LDAP attributes GitLab will use for the new user account. Fixes #2412. See merge request !1261
| * | Add to docsDouwe Maan2015-09-091-2/+2
| | |
| * | Expand explanation in config fileDouwe Maan2015-09-091-15/+20
| | |
| * | Add attributes to LDAP::Config.Douwe Maan2015-09-081-0/+1
| | |
| * | Allow configuration of LDAP attributes GitLab will use for the new user account.Douwe Maan2015-09-081-0/+15
| | |
* | | Update documentation and config filesKamil Trzcinski2015-09-161-3/+19
| | |
* | | Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2015-09-151-9/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g # Conflicts: # Gemfile.lock
| * \ \ Merge pull request #9138 from liyakun/masterStan Hu2015-09-141-0/+10
| |\ \ \ | | | | | | | | | | add "replace" and "upload" functionality
| | * | | Add "Replace" and "Upload" featuresliyakun2015-09-151-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge branch 'dashboard-titles' into 'master'Dmitriy Zaporozhets2015-09-111-9/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up overlap between dashboard and explore - Clean up overlap between dashboard and explore. ... 5d785457 - Split up SnippetsController into separate dashboard and explore sections. - Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not. - Consistently case `Back to X` links. 260fcd45 - Link to help from signin page bottom. d92696d3 - Make Help accessible for guests. c258e977 cc @dzaporozhets See merge request !1260
| | * \ \ \ Merge branch 'master' into dashboard-titlesdashboard-titlesDouwe Maan2015-09-104-2/+42
| | |\ \ \ \ | | | |/ / /
| | * | | | Clean up overlap between dashboard and explore.Douwe Maan2015-09-081-9/+11
| | | |/ / | | |/| | | | | | | | | | | | | | | | | - Split up SnippetsController into separate dashboard and explore sections. - Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not.
* | | | | Revert "monkey patch of Hash"Kamil Trzcinski2015-09-141-15/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit 6014019ed49295178ebd0c4ce5f6f1d210219420.
* | | | | monkey patch of HashValery Sizov2015-09-141-0/+15
| | | | |
* | | | | Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' of ↵Valery Sizov2015-09-141-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
| * \ \ \ \ Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-111-1/+6
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Bump rouge to 1.10.1Stan Hu2015-09-101-24/+0
| | | |/ / | | |/| |
View Lorry Controller Status