summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Allow to configure gitlab_shell_secret locationJakub Jirutka2015-05-163-4/+9
|
* Fix.Douwe Maan2015-05-151-13/+5
|
* Improve fix.attr_encryped_no_db_connectionDouwe Maan2015-05-151-13/+12
|
* Don't require DB conncetion in AttrEncrypted.Douwe Maan2015-05-151-0/+29
|
* Merge branch 'omniauth-csrf' into 'master'Dmitriy Zaporozhets2015-05-141-0/+5
|\ | | | | | | | | | | | | | | Protect OmniAuth request phase against CSRF. Addresses #2268. See merge request !1793
| * Protect OmniAuth request phase against CSRF.Douwe Maan2015-04-241-0/+5
| |
* | Improve OAuth application flash messages.Douwe Maan2015-05-131-5/+5
| |
* | Add otp_attempt to filtered parametersRobert Speicher2015-05-091-1/+1
| |
* | Render 2fa recovery codes instead of downloading itDmitriy Zaporozhets2015-05-091-1/+1
| |
* | Add support for backup codesDmitriy Zaporozhets2015-05-092-1/+6
| |
* | Fix rubocop complainDmitriy Zaporozhets2015-05-091-1/+1
| |
* | Create Two-factor authentication resource for userDmitriy Zaporozhets2015-05-091-0/+1
| |
* | Init 2 factor authentication for user modelDmitriy Zaporozhets2015-05-091-0/+4
| |
* | Merge branch 'rs-task_list' into 'master'Dmitriy Zaporozhets2015-05-081-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Use task_list gem for task lists Task Lists can now be used in comments, and they'll render in previews. :clap: Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271 See merge request !599
| * | Disable Rack::MiniProfiler for Jasmine's specs routeRobert Speicher2015-05-061-0/+1
| | |
* | | Revert "Allow to configure smtp and sendmail in gitlab.yml"Dmitriy Zaporozhets2015-05-066-89/+40
|/ /
* | Allow to configure smtp and sendmail in gitlab.ymlJakub Jirutka2015-05-066-40/+89
| |
* | Fix config template from parse errorsStan Hu2015-05-031-3/+3
| |
* | Merge branch 'master' into 'master'Achilleas Pipinellis2015-05-031-0/+3
|\ \ | | | | | | | | | | | | | | | Update config.yml.example See merge request !597
| * | Update config.yml.examplewin322015-05-021-1/+4
| | |
* | | Merge branch 'restrict-signups-to-domains' into 'master'Dmitriy Zaporozhets2015-05-031-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add application setting to restrict user signups to e-mail domains This feature was requested long ago: http://feedback.gitlab.com/forums/176466-general/suggestions/4118466-ability-to-register-only-from-ceratain-domains This MR is based off !253 but changed to use application settings and use wildcard strings to give more flexibility in pattern matching. Regexps seemed overkill and prone to mistakes. Also note that validation is ONLY done on creation to prevent breaking existing users who do not have a whitelisted domain. However, this allows a user to sign-up and change his/her email to a non-whitelisted domain. Screenshots: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b312046aae03971f37f4247382971fc6/image.png) ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/94bdf3ffaf37c2e8324eff83308f81f0/image.png) See merge request !598
| * | | Add application setting to restrict user signups to e-mail domainsStan Hu2015-05-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature was requested long ago: http://feedback.gitlab.com/forums/176466-general/suggestions/4118466-ability-to-register-only-from-ceratain-domains This MR is based off !253 but changed to use application settings and use wildcard strings to give more flexibility in pattern matching. Regexps seemed overkill and easy to get wrong. Only restrict e-mail addresses upon creation
* | | | Make Reply-To config apply to change e-mail confirmation and other notificationsStan Hu2015-05-011-6/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | sent through Devise Fix test case that was passing due to a broken `around` statement. Closes #1556
* | | Merge branch 'fix-commit-data-url-generation' into 'master'Douwe Maan2015-04-281-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where commit data would not appear in some subdirectories Fix issue where commit data would not show up in some subdirectories due to escaped slashes. For example: https://gitlab.common-lisp.net/ecl/ecl/tree/develop/src/gc (now patched with fix) The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76ed) caused slashes in a tree to be escaped automatically. Using a wildcard glob in the route prevents this behavior. * Closes #1478, #1459 * Closes https://github.com/gitlabhq/gitlabhq/issues/9037 See merge request !581
| * | | Fix bug where commit data would not appear in some subdirectoriesStan Hu2015-04-261-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76ed) caused slashes in a tree to be escaped automatically. Using wildcard globs prevents this behavior. Closes #1478, #1459
* | | Merge branch 'rs-issue-2269' into 'master'Dmitriy Zaporozhets2015-04-281-11/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate settings for default_url_options Closes #2269 See merge request !1797
| * | | Set default_url_options in test environments tooRobert Speicher2015-04-251-11/+9
| |/ /
* | | Add new admin settingsVinnie Okada2015-04-261-1/+0
|/ / | | | | | | | | Add new global application settings for default project and snippet visibility levels.
* | Merge branch 'atom-feeds-everywhere' into 'master'Dmitriy Zaporozhets2015-04-241-3/+3
|\ \ | | | | | | | | | | | | | | | Add project activity atom feed and show atom feed buttons everywhere where applicable. See merge request !555
| * | Add atom feed for project activity.Douwe Maan2015-04-231-3/+3
| | |
* | | Add default_url_options initializerRobert Speicher2015-04-231-0/+13
|/ / | | | | | | Fixes #2266
* | Merge branch 'rs-rails-env-predicates' into 'master'Dmitriy Zaporozhets2015-04-231-1/+1
|\ \ | | | | | | | | | | | | | | | Fix two places where we should be using `Rails.env.development?` See merge request !550
| * | Fix two places where we should be using `Rails.env.development?`rs-rails-env-predicatesRobert Speicher2015-04-201-1/+1
| |/
* | Merge branch 'master' into new-sidebarDmitriy Zaporozhets2015-04-231-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/snippets_controller.rb
| * \ Merge branch 'rs-reply-hotkey' into 'master'Dmitriy Zaporozhets2015-04-221-0/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | "Reply quoting selected text" shortcut/hotkey Adds the <kbd>r</kbd> hotkey for quoting selected text on Issuable forms. This MR also updates the jasmine gem and adds jasmine-rails to let us use the asset pipeline (and Coffeescript) in JS specs. See merge request !1775
| | * rails g jasmine_rails:installRobert Speicher2015-04-181-0/+1
| | |
* | | Start applying new layout to snippets pagesDmitriy Zaporozhets2015-04-221-1/+2
|/ /
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-04-201-2/+2
|\ \
| * | Fix Resource Owner Password Authentication FlowRoshan Gautam2015-04-171-2/+2
| |/
* | Loosen help page parameter constraints for categoryRobert Speicher2015-04-151-1/+1
| |
* | Add constraints to help#show route parametersRobert Speicher2015-04-151-1/+1
| |
* | Add Markdown to Mime typesRobert Speicher2015-04-151-0/+2
| |
* | Revert "Fix and improve help rendering"Robert Speicher2015-04-152-2/+1
|/ | | | This reverts commit d365004e684e98459061fcd5fbaf9bea880934a8.
* Merge branch 'ldap-block_auto_created_users' into 'master'Dmitriy Zaporozhets2015-04-152-0/+6
|\ | | | | | | | | | | | | | | Add config var to block auto-created LDAP users. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2110. See merge request !522
| * Clarify config var and add to LDAP docs.ldap-block_auto_created_usersDouwe Maan2015-04-141-1/+3
| |
| * Add config var to block auto-created LDAP users.Douwe Maan2015-04-142-0/+4
| |
* | Merge branch 'invitation' into 'master'Dmitriy Zaporozhets2015-04-151-0/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to be invited. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2058. The "Add members" panes for both Group Members and Project Members have gained a line of text by the People field. ![Screen_Shot_2015-04-10_at_14.14.32](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fe990e65eccd9203d7324b492941362b/Screen_Shot_2015-04-10_at_14.14.32.png) Entering an email address that is not already a member will give you the option to invite them. ![Screen_Shot_2015-04-10_at_14.14.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d6b0d4571ea90f2a2e4af8f5b336e8e1/Screen_Shot_2015-04-10_at_14.14.48.png) Choosing the option will add them to the People field. This works the right way (TM) in combination with adding existing users as members. ![Screen_Shot_2015-04-10_at_14.15.09](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a618e5ec292d79578b16400dca6d4cfe/Screen_Shot_2015-04-10_at_14.15.09.png) The invited member will be shown in the members list as such. The access level can be changed, and the invite can be revoked by deleting the member. ![Screen_Shot_2015-04-10_at_14.15.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3695b9a6778d367b275115747579b46e/Screen_Shot_2015-04-10_at_14.15.19.png) The invited user will receive an email with an "Accept invitation" link. ![Screen_Shot_2015-04-10_at_14.17.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/730121888153117d83c3cd0e4f5c90f6/Screen_Shot_2015-04-10_at_14.17.52.png) If they're not already logged in, clicking this link will redirect them to the sign in/up page with a helpful notice. ![Screen_Shot_2015-04-10_at_14.18.12](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1a26a5fa13321e7ef77ed8b538c8557d/Screen_Shot_2015-04-10_at_14.18.12.png) Signing in or signing up will redirect them back to the invite detail page, where they can actually accept the invitation, which will update the member record in question to point to the user in question. ![Screen_Shot_2015-04-10_at_14.18.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7ac33085463a99b8cfa6baa13bfa1235/Screen_Shot_2015-04-10_at_14.18.48.png) Accepting the invitation will redirect them to the group (or project) with an appropriate notice. ![Screen_Shot_2015-04-10_at_14.18.58](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7bf02a2e3bea589a11df401c23e68648/Screen_Shot_2015-04-10_at_14.18.58.png) As currently, they will also receive this information by email. ![Screen_Shot_2015-04-10_at_14.24.00](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b44a342068433a268c0a06ed9e791ffa/Screen_Shot_2015-04-10_at_14.24.00.png) At the same time, the person who initially invited the email address is sent a notification as well, so they know of the new member and to tell them what name the user signed up with. ![Screen_Shot_2015-04-10_at_14.19.07](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b29fea128186f938ec76bd7dec016b83/Screen_Shot_2015-04-10_at_14.19.07.png) The member row on the Members page will now have been updated with the new user account. ![Screen_Shot_2015-04-10_at_14.19.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cf503d3d1679614e03acec2e946a28c3/Screen_Shot_2015-04-10_at_14.19.23.png) See merge request !500
| * | Let invites be declined.Douwe Maan2015-04-141-0/+1
| | |
| * | Let membership invitations be resent.Douwe Maan2015-04-141-0/+5
| | |
| * | Add invites controller.Douwe Maan2015-04-141-0/+9
| | |