8f4ae40e3c
Add missing migrations
2015-10-20 19:24:41 +02:00
df9062d0b5
Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notify
2015-10-18 11:31:49 +02:00
f405954764
Added indexes for notes.line_code and CI columns
...
This adds indexes for the following columns:
* notes.line_code
* ci_projects.gitlab_id
* ci_projects.shared_runners_enabled
* ci_builds.type
* ci_builds.status
2015-10-16 21:58:30 +02:00
c6be5006da
Add index on ci_commits.gl_project_id
...
Fixes #3086
2015-10-16 15:29:50 +02:00
914cfbd2f1
Implement Commit Status API
2015-10-12 11:53:49 +02:00
ae4fbae26c
Send an email (to support) when a user is reported for spam
2015-10-08 17:33:57 -04:00
03417456f0
Revamp finding projects by namespaces
...
By using a JOIN we can remove the need for using 2 separate queries to
find a project by its namespace. Combined with an index (only needed for
PostgreSQL) this reduces the query time from ~245 ms (~520 ms for the
first call) down to roughly 10 ms (~15 ms for the first call).
2015-10-08 14:35:32 +02:00
b2803a5e05
Merge branch 'master' of github.com:gitlabhq/gitlabhq
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-05 20:15:43 +02:00
3d90560c1e
Merge branch 'user-preferences-layout-option' of https://github.com/gopeter/gitlabhq into gopeter-user-preferences-layout-option
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-05 20:14:32 +02:00
f088ffe8f7
Merge branch 'rs-remove-ci-disable'
...
See merge request !1512
2015-10-05 20:06:31 +02:00
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
e2c5d08e7e
added user preference to change layout width
2015-10-05 17:22:47 +02:00
198f4b703d
Fix db/schema.rb
2015-10-05 14:37:42 +02:00
317a746954
Make commit_spec run
2015-10-05 12:02:26 +02:00
6ca5a258ca
Update db schema
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-01 11:33:46 +02:00
05fdd12fd9
Improve error message when merging fails
2015-10-01 09:45:47 +03:00
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
9498a40052
Fix migrations
2015-09-29 10:47:04 +02:00
3031209b07
Fix db/schema.rb
2015-09-29 10:47:03 +02:00
30c78e70cb
WIP
2015-09-29 10:47:03 +02:00
3377808193
Fix reply by email for comments on a specific line in a diff/commit.
2015-09-20 18:18:39 +02:00
259851c0d6
Bump devise-two-factor to 2.0.0
...
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605
See https://github.com/tinfoil/devise-two-factor/pull/43
2015-09-19 21:16:18 -04:00
e41a29b0c3
Allow to disable GitLab CI
2015-09-18 12:46:47 +02:00
fe17a236e3
Allow custom info to be added to Help page
...
Fixes #2536
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-09-18 10:15:40 +02:00
eb1444ee11
Fix schema downgrade introduced by: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1299
2015-09-17 10:31:08 +02:00
ce4defaf2f
enable SSL by default
2015-09-17 09:51:24 +03:00
912f470497
Fix ordering issue
2015-09-16 16:59:54 +02:00
9a3d0f1d92
Add rake task to migrate CI tags
2015-09-15 00:29:20 +02:00
0b5d627cd4
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
2015-09-09 14:56:02 +02:00
76c6aeb9bc
Merge CI factories and CI spec/support with GitLab
2015-09-09 13:37:50 +02:00
6bd3d72bbd
added spinach for glabal labels
2015-09-03 19:02:14 +03:00
57d0013090
CRUD for admin labels
2015-09-03 15:50:23 +03:00
f0aa6986fa
Update db schema
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-01 14:01:56 +02:00
843694f902
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
2015-08-26 17:53:31 -07:00
bafffb2d14
Enable SSL verification for Webhooks
2015-08-26 15:48:31 +03:00
046b283127
Groundwork for merging CI into CE
2015-08-25 18:42:46 -07:00
ed1d4fa477
Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab
...
and request them each session. Pass these tokens to the project import data.
This prevents the need to encrypt these tokens and clear them in case they
expire or get revoked.
For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get
an Error 500 with no way to recover:
```
Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000
Processing by Import::BitbucketController#status as HTML
Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms)
NameError (uninitialized constant Import::BitbucketController::Unauthorized):
app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions'
app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions'
app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized'
```
Closes #1871
2015-08-23 09:23:44 -07:00
3d51a6d435
Merge branch 'master' into reply-by-email
2015-08-20 12:19:19 -07:00
55dca86b98
Import sources: settings in the admin interface
2015-08-20 11:28:27 +02:00
f76eac56b9
Reply by email POC
2015-08-18 15:46:36 -07:00
ad55f0d6f9
Merge branch 'master' into comment-updated-by
2015-08-07 15:05:17 +02:00
cba7f20dc8
Allow users to send abuse reports
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-06 14:03:27 +02:00
36bd6c8494
Show who last edited a comment if it wasn't the original author
2015-07-30 14:45:54 +02:00
f0116f1335
Store commit count in project table
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-17 15:22:56 +02:00
5f34759ecb
Allow user to specify content he wants to see on project page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-13 18:24:15 +02:00
77fb7e078e
Fix db schema
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-08 12:49:06 +02:00
d192f921c1
Move project activity to separate tab. Add more features to project home page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-07 16:01:12 +02:00
411829fdb5
Audit log for user authentication
2015-07-06 12:36:08 +03:00
d3ff8c1a95
Make default value for otp_required_for_login false instead of null
2015-06-20 19:40:48 -04:00
2bc4fd2d04
Add `dashboard` attribute to User model
2015-06-13 17:59:11 -04:00
567a25b630
Ensure `session_expire_delay` field exists before accessing it
...
Closes #1798
2015-06-13 00:31:08 -04:00
1d080f5745
session_expire_seconds => session_expire_delay
...
delay is in seconds
more legible code in session_store
Added `GitLab restart required` help block to session_expire_delay
2015-06-10 22:10:00 -04:00
84a414fe53
Add session expiration delay configuration through UI application
...
settings
2015-06-05 11:50:37 -04:00
60225a067d
Allow to configure a URL to show after sign out
2015-05-29 18:20:15 +02:00
96d6fdc27c
Add option to disallow users from registering any application to use GitLab as an OAuth provider
2015-05-29 13:29:16 +02:00
deeff56967
Add support for Webhook note events
...
Closes https://github.com/gitlabhq/gitlabhq/issues/6745
2015-05-21 23:48:16 -04:00
f32a045ef4
Merge branch 'version-check' into 'master'
...
Version check
See merge request !1509
2015-05-13 11:17:16 +00:00
474023b71a
Fix Gemfile.lock
2015-05-12 14:26:46 +03:00
1a1e42ad31
Merge branch 'rs-system-note' into 'master'
...
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-12 10:45:42 +00:00
cdb69d728c
Add migration to convert legacy system notes
2015-05-11 00:01:15 -04:00
0c113c8dcb
Make otp_backup_codes a text field
2015-05-09 17:32:46 -04:00
c3cf32e863
Merge branch 'version-check' into gl-version-check
...
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-08 16:05:00 +03:00
ebcc810b9d
Remove project dropdown and fix db sche,a
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 18:29:23 +03:00
eb4f1eb5f5
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 easy to get wrong.
Only restrict e-mail addresses upon creation
2015-05-02 09:36:52 -07:00
2f4426b7e4
Merge branch 'fix-project-tags' into 'master'
...
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-30 17:20:36 +00:00
39a55bdf1a
Merge branch 'search-layout' into 'master'
...
Improvements to search layout
Improve search layout to match new UI style and make it more mobile-firendly
See merge request !585
2015-04-29 18:40:16 +00:00
4d3a93af2d
Remove abandoned GroupMembers
2015-04-29 13:46:57 +03:00
1ff01d26e1
Continue refactoring and restyle of search layout
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-28 22:04:19 +03:00
44afcd2019
Fix DB error when trying to tag a repository
...
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-27 06:09:20 -07:00
bd557e4b64
Add new admin settings
...
Add new global application settings for default project and snippet
visibility levels.
2015-04-26 07:48:19 -06:00
456e3a7000
Update schema.
2015-04-24 14:49:23 +02:00
5a4ebfb47a
Fixed the Rails/ActionFilter cop
...
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-04-20 15:39:37 +02:00
7d98c8842d
Move import data out of project so it doesn't take ages to load.
2015-04-17 14:49:00 +02:00
e3d818a4e8
Merge branch 'invitation' into 'master'
...
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.
Entering an email address that is not already a member will give you the option to invite them.
Choosing the option will add them to the People field. This works the right way (TM) in combination with adding existing users as members.
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.
The invited user will receive an email with an "Accept invitation" link.
If they're not already logged in, clicking this link will redirect them to the sign in/up page with a helpful notice.
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.
Accepting the invitation will redirect them to the group (or project) with an appropriate notice.
As currently, they will also receive this information by email.
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.
The member row on the Members page will now have been updated with the new user account.
See merge request !500
2015-04-15 10:48:28 +00:00
63b21945d2
Merge branch 'google-code-import' into 'master'
...
Import projects from Google Code.
Resolves #1257 .
Issue import logic almost entirely taken from https://gitlab.com/o9000/google-code-to-gitlab ( ♥️ @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
### Imported issue
See merge request !471
2015-04-15 06:53:42 +00:00
c1531fe1d8
Add spinach tests around accepting and declining invitations.
2015-04-14 18:04:29 +02:00
7b28218f96
Allow user to choose which email to be public
...
This commit allows user to show one of their emails in profile page,
or don't show email in this page.
2015-04-14 19:42:48 +08:00
1e97864958
Add invite data to member.
2015-04-14 12:06:42 +02:00
4ab717ea6a
Merge branch 'ldap_migration'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
db/schema.rb
2015-04-13 17:18:02 +03:00
9c14ed0689
Merge branch 'public-deploy-keys' into 'master'
...
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:
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:
Admin detail page:
Projects using the deploy key are listed on the left and can be disabled easily.
See merge request !469
2015-04-13 09:08:13 +00:00
1fd03a9b79
Add migration to rename BuildboxService to BuildkiteService
2015-04-11 14:05:23 -04:00
8666f497ff
fix ldap identities
2015-04-11 17:56:45 +03:00
7b5bc32cad
Allow projects to be imported from Google Code.
2015-04-03 15:29:27 +02:00
edc4a56d26
Allow admin to create public deploy keys that are accessible to any project.
2015-04-03 12:23:20 +02:00
dfd256f29e
Support configurable attachment size via Application Settings
...
Fix bug where error messages from Dropzone would not be displayed on the issues page
Closes #1258
2015-04-02 00:04:08 -07:00
f3650d2e5d
Add migration.
2015-03-24 17:00:56 +01:00
6ef20926ee
Add location to user profile
2015-03-20 16:52:23 -07:00
9e5738b007
Extend the commit calendar to show the actual commits for a date
2015-03-18 08:42:42 +01:00
9162e34bb0
Merge branch 'issue_subscription' into 'master'
...
Subscription to issue/mr
Fixes #1911 and #1909
See merge request !1702
2015-03-17 16:45:04 +00:00
f53683e67f
fix specs
2015-03-16 16:51:49 +02:00
410d25c8ca
rename table subscribe; make it polymorfic
2015-03-16 15:22:50 +02:00
09ef69b7c8
code folding fix
2015-03-16 13:52:55 +02:00
9698b36c1c
Subscription
2015-03-15 19:44:59 +02:00
ad0ca0499a
Merge branch 'master' into fix-restricted-visibility
...
Conflicts:
db/schema.rb
2015-03-14 10:49:11 -06:00
100d750bc5
Add feature to disable version check
2015-03-10 12:51:46 -07:00
ed4c7190ed
Fix importers with OCC
2015-03-10 12:23:11 +02:00
cacac147de
Move restricted visibility settings to the UI
...
Add checkboxes to the application settings page for restricted
visibility levels, and remove those settings from gitlab.yml.
2015-03-07 13:11:08 -07:00
7e204cf389
Added comment notification events to HipChat and Slack services.
...
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-06 06:54:00 -08:00
afe5d7d209
Issue #595 : Support Slack notifications upon issue and merge request events
...
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-03-03 11:14:31 +01:00
a52529f9b6
Merge branch 'bitbucket-import'
...
Conflicts:
app/views/import/gitorious/status.html.haml
db/schema.rb
2015-02-25 09:21:45 -08:00
Kamil Trzcinski
Douwe Maan
Yorick Peterse
Jonathan Rochkind
Dmitriy Zaporozhets
Robert Speicher
Peter Göbel
Valery Sizov
Jeroen van Baarsen
Valery Sizov
Stan Hu
Artem Sidorenko
themaze75
Eric Maziade
Alex Lossent
Dmitriy Zaporozhets
Vinnie Okada
Senorsen
Hannes Rosenögger
