Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-05-13Merge branch 'version-check' into 'master'Dmitriy Zaporozhets
Version check See merge request !1509
2015-05-12Fix Gemfile.lockDmitriy Zaporozhets
2015-05-12Merge branch 'rs-system-note' into 'master'Dmitriy Zaporozhets
Add SystemNoteService class The Note model was basically two models crammed together - one handling user-created notes (i.e., comments on things) and one handling system-created notes (i.e., references). This splits out the system-specific stuff to a new SystemNoteService class. See merge request !595
2015-05-11Add migration to convert legacy system notesRobert Speicher
2015-05-10Make otp_backup_codes a text fieldRobert Speicher
2015-05-08Merge branch 'version-check' into gl-version-checkDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/admin/application_settings_controller.rb app/views/admin/application_settings/_form.html.haml db/schema.rb
2015-05-05Remove project dropdown and fix db sche,aDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-02Add application setting to restrict user signups to e-mail domainsStan Hu
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
2015-04-30Merge branch 'fix-project-tags' into 'master'Douwe Maan
Fix DB error when trying to tag a repository Steps to reproduce: Go to a project settings, add tags, click on save changes Observed behavior: Error 500 ``` PG::Error: ERROR: column "taggings_count" does not exist LINE 1: UPDATE "tags" SET "taggings_count" = COALESCE("taggings_coun... ``` Ran `rake acts_as_taggable_on_engine:install:migrations`, removed the first migration that created the `tags` and `taggings` table, and added the rest. * Closes #1512 * Closes #1550 * Closes https://github.com/gitlabhq/gitlabhq/issues/6867 * Closes https://github.com/gitlabhq/gitlabhq/issues/9194 See merge request !577
2015-04-29Merge branch 'search-layout' into 'master'Dmitriy Zaporozhets
Improvements to search layout Improve search layout to match new UI style and make it more mobile-firendly See merge request !585
2015-04-29Remove abandoned GroupMembersValery Sizov
2015-04-28Continue refactoring and restyle of search layoutDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-27Fix DB error when trying to tag a repositoryStan Hu
Upon tagging a repository, an error due to a missing migration occurred: ``` PG::Error: ERROR: column "taggings_count" does not exist LINE 1: UPDATE "tags" SET "taggings_count" = COALESCE("taggings_coun... ``` Ran `rake acts_as_taggable_on_engine:install:migrations`, removed the first migration that created the `tags` and `taggings` table, and added the rest. Closes #1512 Closes https://github.com/gitlabhq/gitlabhq/issues/6867 Closes https://github.com/gitlabhq/gitlabhq/issues/9194
2015-04-26Add new admin settingsVinnie Okada
Add new global application settings for default project and snippet visibility levels.
2015-04-24Update schema.Douwe Maan
2015-04-20Fixed the Rails/ActionFilter copJeroen van Baarsen
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-04-17Move import data out of project so it doesn't take ages to load.Douwe Maan
2015-04-15Merge branch 'invitation' into 'master'Dmitriy Zaporozhets
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
2015-04-15Merge branch 'google-code-import' into 'master'Douwe Maan
Import projects from Google Code. Resolves #1257. Issue import logic almost entirely taken from https://gitlab.com/o9000/google-code-to-gitlab ( :hearts: @o9000). ### To do - [x] List projects from Google Takeout file - [x] Import Git repository - [x] Import issues - [x] Link to correct attachment URL (https://code.google.com/p/support-tools/issues/detail?id=50) - [x] Handle deleted attachments - [x] Handle blockedOn attribute - [x] Add directions on how to get data from Google Takeout ### Import instructions ![Screen_Shot_2015-04-03_at_16.02.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4a87038035fbad9441cf613b8cdcc690/Screen_Shot_2015-04-03_at_16.02.21.png) ### Imported issue ![Screen_Shot_2015-04-03_at_16.25.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b2c2eaf5ecfcf57b3c48511eb5d26db4/Screen_Shot_2015-04-03_at_16.25.49.png) See merge request !471
2015-04-14Add spinach tests around accepting and declining invitations.Douwe Maan
2015-04-14Allow user to choose which email to be publicSenorsen
This commit allows user to show one of their emails in profile page, or don't show email in this page.
2015-04-14Add invite data to member.Douwe Maan
2015-04-13Merge branch 'ldap_migration'Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: db/schema.rb
2015-04-13Merge branch 'public-deploy-keys' into 'master'Dmitriy Zaporozhets
Allow admin to create public deploy keys that are accessible to any project. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1774. Project settings: ![Screen_Shot_2015-03-27_at_14.46.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/01799ff912671ba6db3f828ea1aca1a6/Screen_Shot_2015-03-27_at_14.46.48.png) The "Public deploy keys" section is only shown when there are any. If there are public deploy keys but no project deploy keys, only public deploy keys are shown. If there are no public deploy keys and no project deploy keys, the current "Deploy keys from projects you have access to will be displayed here" placeholder is shown. The list of projects below the public key has been changed to only show projects the user has access to. "Public deploy key" seems to be repeated on the left, but the first is just the title. The label is always visible for public deploy keys. Admin index: ![Screen_Shot_2015-03-27_at_14.47.06](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ea889d274cfd3f0694d47d602f4f3e94/Screen_Shot_2015-03-27_at_14.47.06.png) Admin detail page: ![Screen_Shot_2015-03-27_at_14.47.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8c8475e05bf6b497da3b9f1bc102329f/Screen_Shot_2015-03-27_at_14.47.16.png) Projects using the deploy key are listed on the left and can be disabled easily. See merge request !469
2015-04-11Add migration to rename BuildboxService to BuildkiteServiceRobert Speicher
2015-04-11fix ldap identitiesValery Sizov
2015-04-03Allow projects to be imported from Google Code.Douwe Maan
2015-04-03Allow admin to create public deploy keys that are accessible to any project.Douwe Maan
2015-04-02Support configurable attachment size via Application SettingsStan Hu
Fix bug where error messages from Dropzone would not be displayed on the issues page Closes #1258
2015-03-24Add migration.Douwe Maan
2015-03-21Add location to user profileDmitriy Zaporozhets
2015-03-18Extend the commit calendar to show the actual commits for a dateHannes Rosenögger
2015-03-17Merge branch 'issue_subscription' into 'master'Dmitriy Zaporozhets
Subscription to issue/mr Fixes #1911 and #1909 ![joxi_screenshot_1426601822159](https://dev.gitlab.org/gitlab/gitlabhq/uploads/53021bc5783271322ab2dfba7598eaa3/joxi_screenshot_1426601822159.png) ![joxi_screenshot_1426601836423](https://dev.gitlab.org/gitlab/gitlabhq/uploads/244ff360fbd6f30980f8dad699400814/joxi_screenshot_1426601836423.png) See merge request !1702
2015-03-16fix specsValery Sizov
2015-03-16rename table subscribe; make it polymorficValery Sizov
2015-03-16code folding fixValery Sizov
2015-03-15SubscriptionValery Sizov
2015-03-14Merge branch 'master' into fix-restricted-visibilityVinnie Okada
Conflicts: db/schema.rb
2015-03-10Add feature to disable version checkDmitriy Zaporozhets
2015-03-10Fix importers with OCCValery Sizov
2015-03-07Move restricted visibility settings to the UIVinnie Okada
Add checkboxes to the application settings page for restricted visibility levels, and remove those settings from gitlab.yml.
2015-03-06Added comment notification events to HipChat and Slack services.Stan Hu
Supports four different event types all bundled under the "note" event type: - comments on a commit - comments on an issue - comments on a merge request - comments on a code snippet
2015-03-03Issue #595: Support Slack notifications upon issue and merge request eventsStan Hu
1) Adds a DB migration for all services to toggle on push, issue, and merge events. 2) Upon an issue or merge request event, fire service hooks. 3) Slack service supports custom messages for each of these events. Other services not supported at the moment. 4) Label merge request hooks with their corresponding actions.
2015-02-25Merge branch 'bitbucket-import'Dmitriy Zaporozhets
Conflicts: app/views/import/gitorious/status.html.haml db/schema.rb
2015-02-24Add Bitbucket importer.Douwe Maan
2015-02-23Give last_activity_at a default value so it will always be setMarco Wessel
2015-02-13Allow users that signed up via OAuth to set their password in order to use ↵Douwe Maan
Git over HTTP(S).
2015-02-13Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets
2015-02-12Merge pull request #8445 from jvanbaarsen/project-spec-speed-upJeroen van Baarsen
requests/api/project_spec.rb speed up
2015-02-11Remove not null constraint on project_id in services.Marin Jankovski