home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 12:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,815 Commits 48 Branches 340 Tags
f801e2243dcce6d3bdce01acf62fbf5a49a301da
Commit Graph
26815 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Timothy Andrew f801e2243d A new branch created for a confidential issue is named <id>-confidential-issue. 2016-04-19 09:22:55 +05:30
Timothy Andrew aa396ae5ee Remove unused variable in IssuesController. 2016-04-18 13:01:23 +05:30
Timothy Andrew 953bafff90 Merge remote-tracking branch 'origin/master' into 14566-confidential-issue-branches 2016-04-15 09:50:53 +05:30
Timothy Andrew f5ce601c2b Make a few style changes based on MR feedback. 2016-04-15 09:31:26 +05:30
Robert Speicher a1497ba39c Merge branch 'fix-migrate_new_notification_setting' into 'master' 
Fix datetime format when migrating new notification settings on MySQL

Closes #15264 

See merge request !3733
 2016-04-14 22:45:52 +00:00
Douglas Barbosa Alexandre 70c9ceb7b1 Fix datetime format when migrating new notification settings on MySQL 2016-04-14 18:46:18 -03:00
Robert Speicher 0554664e56 Merge branch 'patch-1' into 'master' 
change "very demand" to "specific demand" in CI runner docs

[ci skip]

See merge request !3726
 2016-04-14 21:39:57 +00:00
Jacob Schatz ba18e0b208 Merge branch '14176-diff-paste-data' into 'master' 
Copying and pasting doesn't grab line numbers or +/-

Fixes #14176 

See merge request !3687
 2016-04-14 21:01:08 +00:00
Stan Hu 95ce4d29c3 Merge branch 'rs-sentry-contexts' into 'master' 
Add Sentry program context even without a current user



See merge request !3729
 2016-04-14 20:18:01 +00:00
Robert Speicher 1f0274e55e Merge branch 'remove-ci-nginx-config' into 'master' 
Remove deprecated NGINX CI config

[ci skip]

See merge request !3728
 2016-04-14 19:34:57 +00:00
Robert Speicher 97fd9616ac Merge branch 'emoji_category_fix' into 'master' 
Emoji categories fix

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14020

See merge request !3727
 2016-04-14 18:22:49 +00:00
Jacob Schatz 9cd5e0fc48 Merge branch 'subscribe-button-fix' into 'master' 
Removed references to subscribe-button CSS class

These were being blocked by adblocks

Closes #15043

See merge request !3677
 2016-04-14 18:11:18 +00:00
Robert Speicher f583129767 Add Sentry program context even without a current user 2016-04-14 13:56:30 -04:00
Valery Sizov 6ae2680ce7 Emoji categories fix 2016-04-14 20:45:55 +03:00
Annabel Dunstone 80d8f8b876 Syntax & style updates 2016-04-14 12:33:29 -05:00
Achilleas Pipinellis 2165bbc785 Remove deprecated NGINX CI config 2016-04-14 20:31:19 +03:00
Robert Speicher 95a867e0af Merge branch 'auto-fsck' into 'master' 
Auto git fsck

Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232

See merge request !3232
 2016-04-14 17:15:58 +00:00
Robert Speicher 58ca84908c Merge branch 'fix-group-projects-sort' into 'master' 
Projects on group page should be sorted by last activity instead of id/created_at

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

Fixes #15237 

See merge request !3716
 2016-04-14 17:15:17 +00:00
Robert Speicher cce21e7490 Update CHANGELOG for "Auto git fsck" 2016-04-14 12:32:33 -04:00
Robert Speicher 7ef35b9c61 Shut up, Rubocop 2016-04-14 12:28:48 -04:00
Jamie Neubert Pedersen b49069b72c change: "very demand" changed to "specific demand" 
This must be an error as the sentence doesn't make sense otherwise
 2016-04-14 16:04:18 +00:00
Rémy Coutable dd9ced0af9 Merge branch 'connorshea/gitlab-ce-revoke-authorized-application' into 'master' 
Fix revoking of authorized OAuth applications

Users were not able to revoke access to authorized OAuth applications. Clicking the "Revoke" button would result in a 404 page, and the application would still be authorized.

Added a spec and also found that the `gon` variables were not being set for this view.

Closes #14370

See merge request !3690
 2016-04-14 15:26:09 +00:00
Rémy Coutable 4a514b27e9 Merge branch 'issue_15155' into 'master' 
Setup visibility level for project when transfering for a group

fixes #15155 

See merge request !3707
 2016-04-14 15:13:08 +00:00
Robert Speicher 39f6cfcc3e Merge branch 'rake-db-reset' into 'master' 
Use rake db:reset instead of db:setup

See merge request !3721
 2016-04-14 15:07:58 +00:00
Jacob Vosmaer 77daebe660 More create_list 2016-04-14 17:05:41 +02:00
Jacob Vosmaer 91cebb7289 Documentation / help improvements 2016-04-14 17:04:18 +02:00
Felipe Artur a8ea2c1895 Change transfer service to use existing methods 2016-04-14 11:34:42 -03:00
Stan Hu e450892f56 Include GonHelper separately and remove created_at in factory 2016-04-14 07:25:27 -07:00
Stan Hu c7e384aab2 Add spec for deletion of authorized OAuth2 application 
Closes #14370

Move gon function into its own helper
 2016-04-14 07:24:58 -07:00
connorsheaandStan Hu 0c082d5e3a Fix the improper delete form being rendered for an oauth_authorized_application 
This fixes the authorized applications not being revoked properly at
`/profile/applications`.

Fixes #14370.
 2016-04-14 07:24:57 -07:00
Annabel Dunstone 2f81baf476 Update click_diff_line 2016-04-14 09:10:40 -05:00
Annabel Dunstone 82d0221b63 Add line type conditional to diff line helper 2016-04-14 09:10:40 -05:00
Annabel Dunstone d176f873e1 Add content attributes to discussion diffs; change styling of add-note icon to prevent white spaces in paste 2016-04-14 09:10:40 -05:00
Annabel Dunstone 7030ffb0e0 Copying and pasting doesn't grab line numbers or +/- 2016-04-14 09:10:40 -05:00
Yorick Peterse a54af831ba Use rake db:reset instead of db:setup 
Using db:reset ensures existing tables are first dropped. This in turn
ensures that we can drop tables regardless of any foreign key
constraints. While CE currently doesn't have any foreign keys EE defines
the following relation:

    remote_mirrors.project_id -> projects.id

MySQL will complain whenever you try to drop the "projects" table first
even when using "DROP TABLE ... CASCADE".
 2016-04-14 15:53:54 +02:00
Rémy Coutable 64776ab2b4 Merge branch 'start-with-iid-on-new-branch' into 'master' 
Start with iid on branch creation

After the discussion it in #3886 it was decided the iid should be in the beginning of the branch name.

See merge request !3708
 2016-04-14 13:41:30 +00:00
Achilleas Pipinellis e1acd361af Merge branch 'master' into 'master' 
Update shibboleth configuration for GitLab 8.6 and Apache 2.4



See merge request !3713
 2016-04-14 13:22:27 +00:00
Phil Hughes a2931a392a Fixed style issues 2016-04-14 14:06:33 +01:00
Zeger-Jan van de Weg 0385cd5a58 Start with iid on branch creation 2016-04-14 14:49:45 +02:00
Achilleas Pipinellis 253615f430 Merge branch 'toc_gitlab_ci_yml' into 'master' 
Add TOC to yaml README and an intro section



See merge request !3719
 2016-04-14 12:42:13 +00:00
Achilleas Pipinellis 072b9c2c8f Add TOC to yaml README and an intro section 
[ci skip]
 2016-04-14 15:40:05 +03:00
Phil Hughes badb353350 Added CHANGELOG item 2016-04-14 11:29:19 +01:00
Phil Hughes fd9c3b7c74 Fixed issue with other links being clicked in diffs 2016-04-14 11:29:19 +01:00
Phil Hughes f3ed4763f5 Correctly scrolls to the line when clicking 2016-04-14 11:29:19 +01:00
Phil Hughes 8a8d4c9bf2 Diff viewer links to correct part of the file 
Added highlight colours to diff rows

Closes #13852
 2016-04-14 11:29:19 +01:00
Rémy Coutable c71cdb194f Merge branch 'simplify-gitlab-url_builder-15202' into 'master' 
Refactor and expose only Gitlab::UrlBuilder.build(record)

```
$ git grep Gitlab::UrlBuilder

app/models/commit.rb:      url: Gitlab::UrlBuilder.build(self),
app/services/issues/base_service.rb:      issue_url = Gitlab::UrlBuilder.build(issue)
app/services/merge_requests/base_service.rb:      hook_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(merge_request)
app/views/search/results/_note.html.haml:- note_url = Gitlab::UrlBuilder.build(note)
lib/gitlab/note_data_builder.rb:        base_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(note)
spec/lib/gitlab/note_data_builder_spec.rb:    expect(data[:object_attributes][:url]).to eq(Gitlab::UrlBuilder.build(note))
spec/lib/gitlab/url_builder_spec.rb:describe Gitlab::UrlBuilder, lib: true do
```

Fixes #15202.

See merge request !3696
 2016-04-14 10:27:49 +00:00
Jacob Schatz 595aba54af Merge branch 'note-form-buttons' into 'master' 
Note form

A lot of the forms have the same actions associated with them so I have created a standard class that encapsulate these actions.

There is also another class that allows toolbar action buttons to be added that will insert different characters based on the HTML `data-prefix` attribute value - this will give us the opportunity to add more actions to the form and maybe create a markdown toolbar in the future.

See merge request !3534
 2016-04-14 10:18:50 +00:00
Phil Hughes 0d8462b897 Fixed scss syntax issue 2016-04-14 10:28:05 +01:00
Phil Hughes ca01103ded Focus variable for dropzone 2016-04-14 10:28:05 +01:00
Phil Hughes 8ffb02d9f8 Added CHANGELOG item 2016-04-14 10:28:05 +01:00