Commit Graph
22224 Commits
Author SHA1 Message Date
Tomasz Maczukin 3a52662ce3 Merge branch 'master' into fix/visibility-level-setting-in-forked-projects
* master: (23 commits)
  Use single spaces
  Improvements to profile page UI
  Replace all usages of `git` command with configurable binary path
  Update Shell Commands doc for configurable git binary path
  Minor reformatting for Facebook integration doc
  Use proper labels for OAuth providers
  Add Facebook authentication
  Bump stamp to ~> 0.6.0
  Add extra padding between user description and links on profile page
  Fix tests
  Fix clipboard button overflow
  Apply new design for user profile page
  Improve profile page UI
  Better name for up-level links
  Fixed User sorting specs
  Only sort by IDs by default
  Added benchmark for User.all
  Add changelog entry for contacted_at
  Spread out runner contacted_at updates
  Only redirect to homepage url when its not the root url
  ...
2015-11-04 23:45:27 +01:00
Tomasz Maczukin 89ecba5e6c Update forks visibility_level after parent project visibility_level change 2015-11-04 23:42:02 +01:00
Robert Schilling cf70e64955 Merge pull request #9805 from mutec/patch-1
fixed typo in installation manual
2015-11-04 23:12:26 +01:00
Tomasz Maczukin 3bc012db77 Fix GitlabV::isibilityLevel::level_name method 2015-11-04 22:13:40 +01:00
Vincent Lequertier dfccc28e38 It makes more sense like this 2015-11-04 19:04:20 +01:00
Sytse Sijbrandij 95da91a66d Use single spaces 2015-11-04 17:07:21 +00:00
mutec 07821839d0 Update installation.md 2015-11-04 17:49:23 +01:00
Kjel Delaey 530c9519d4 Make sure that multi-commit rows inside event bodies are aligned properly..
Prevent the second, third, ... rows from having a different indentation
than the first commit row.

Adding the extra "15px padding" to the event item prevents this.
Having a 15px margin on the avatar only doesn't prevent this from
happening.
2015-11-04 16:40:22 +01:00
Kjel Delaey 3f2955de3b Combine selectors because the same style is being applied 2015-11-04 16:23:39 +01:00
Robert Speicher 5df6b0b758 Merge branch 'facebook-auth' into 'master'
Add Facebook authentication

See merge request !1740
2015-11-04 15:23:38 +00:00
Kjel Delaey 8b0906c86d Apply the same rules to block event items..
Try to avoid alignment issues as well.
2015-11-04 16:22:27 +01:00
Douwe Maan 3f05c22f56 Merge branch 'rs-git-bin-path' into 'master'
Replace all usages of `git` command with configurable binary path

Closes #3311

See merge request !1742
2015-11-04 15:03:16 +00:00
Kjel Delaey 8508be74d2 Style inline event items with titles containing long words properly..
On a tablet in portrait mode with a width of 768px the event-title isn't
aligned properly when the title contains a long string. This also
happens when resizing your browser viewport on a desktop.

Example string:
Administrator pushed new branch feature-branch-with-a-very-long-name at
Gitlab Org / Gitlab Test

In the UI it would look like the example below:

----------
|        |
| AVATAR |                                                                          less than a minute ago
|        |
----------
           Administrator pushed new branch feature-branch-with-a-very-long-name at...
2015-11-04 15:55:19 +01:00
Stan Hu 82aa54193f Merge branch 'fix-infinite-redirect' into 'master'
Only redirect to homepage url when its not the root url

It was possible to create an infi redirect when the user set up the
`home_page_url` to redirect to the main URL of the gitlab instance.

This fix makes sure this redirect is not possible.

Fixes #1020 

/cc @dblessing 

See merge request !1703
2015-11-04 14:53:35 +00:00
Dmitriy Zaporozhets e59852c406 Merge branch 'improve-profile-page' into 'master'
Improvements to profile page UI

* add separator between tabs
* show project avatars
* fix tooltip offset on user calendar
* remove gray hover for tabs

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

For #3042

See merge request !1747
2015-11-04 14:19:09 +00:00
Dmitriy Zaporozhets c5d637b2ca Improvements to profile page UI
* add separator between tabs
* show project avatars
* fix tooltip offset on user calendar
* remove gray hover for tabs

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-04 14:13:25 +01:00
Yorick Peterse 6d91ee0095 Merge branch 'create-project-performance' into 'master'
Improve performance of creating projects



See merge request !1650
2015-11-04 10:14:30 +00:00
Yorick Peterse 219f920c64 Merge branch 'remove-duplicate-orders' into 'master'
Remove duplicate orders

This changes the default order from `created_at DESC, id DESC` to just `id DESC` as this achieves the same results without the overhead of having to sort data twice (we've seen queries go from 200ms to just a few ms by removing the double sort).

cc @jacobvosmaer @dzaporozhets @rspeicher @DouweM 

See merge request !1735
2015-11-04 10:14:08 +00:00
Dmitriy Zaporozhets 31a81b5cba Merge branch 'rs-update-stamp' into 'master'
Bump stamp to ~> 0.6.0

Closes #2801

See merge request !1732
2015-11-04 09:33:38 +00:00
Tim JabsandTim Jabs bdb45360e7 Changed documentation of converting a MySQL-Database with Gitlab to a Postgresdatatabase. The instructions were missleading. See -> https://gitlab.com/gitlab-org/gitlab-ce/issues/2904 2015-11-04 08:30:30 +01:00
Stan Hu 91cbf9db0c Add allow_failure field to commit status API
Closes #3196
2015-11-03 20:41:19 -08:00
mozillazg 5f94e130d1 update example of regex for pytest-cov 2015-11-04 11:41:44 +08:00
Douglas Barbosa Alexandre f2885bedcc Merge branch 'master' into fix-personal-snippet-access-workflow 2015-11-03 20:16:04 -02:00
Robert Speicher d09d62b6b8 Replace all usages of git command with configurable binary path
Closes #3311
2015-11-03 17:11:09 -05:00
Robert Speicher 312375ac7c Update Shell Commands doc for configurable git binary path 2015-11-03 17:10:17 -05:00
Robert Speicher 05eb9e7884 Minor reformatting for Facebook integration doc
[ci skip]
2015-11-03 16:16:30 -05:00
Tomasz Maczukin 7cb442eed4 Fix Project update service
When project is updated and it is a fork, then visibility_level
should not be less restrictive than in its parent project.
2015-11-03 18:23:48 +01:00
Thirumal S c12a4b2a31 merge conflict fixed 2015-11-03 22:49:09 +05:30
Douwe Maan 98dcad2762 Use proper labels for OAuth providers 2015-11-03 17:59:07 +01:00
Douwe Maan 4773d98e83 Add Facebook authentication 2015-11-03 17:59:07 +01:00
Robert Speicher 700909d567 Bump stamp to ~> 0.6.0
Closes #2801
2015-11-03 11:48:05 -05:00
Dmitriy Zaporozhets 482a17089f Merge branch 'improve-profile-page' 2015-11-03 17:33:29 +01:00
Tomasz Maczukin 9e1db139eb Move level_name resolving to Gitlan::VisibilityLevel 2015-11-03 17:23:19 +01:00
Robert Speicher cc40c7af4d Merge branch 'spread-runner-last-updated-at' into 'master'
Spread out runner contacted_at updates

This is meant to prevent having too many concurrent UPDATE requests
caused by runners checking in.

See merge request !1722
2015-11-03 16:14:42 +00:00
Dmitriy Zaporozhets ef6f6f80ec Add extra padding between user description and links on profile page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-03 16:42:02 +01:00
Dmitriy Zaporozhets e0edc01d14 Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-03 16:39:09 +01:00
Tomasz Maczukin d2846293d0 Move visibility_level check for forked projects to Project model 2015-11-03 16:37:39 +01:00
Dmitriy Zaporozhets a74aba01b2 Merge branch 'fix-clipboard-btn' into 'master'
Fix clipboard button overflow

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

See merge request !1739
2015-11-03 15:18:05 +00:00
Dmitriy Zaporozhets 7d0d60d324 Merge branch 'go-to-nav' 2015-11-03 15:52:27 +01:00
Dmitriy Zaporozhets 00ac792cfb Fix clipboard button overflow
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-03 15:44:52 +01:00
Dmitriy Zaporozhets 4d7f00fdea Apply new design for user profile page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-03 15:32:40 +01:00
Kamil Trzciński 77ef4855e0 Merge branch 'drop-old-builds' into 'master'
Cleanup stuck CI builds

Fixes #3143

/cc @dzaporozhets @jacobvosmaer 

See merge request !1655
2015-11-03 13:56:43 +00:00
Valery Sizov b12e17ff55 Merge branch 'web_hook_repo_changes' 2015-11-03 15:05:50 +02:00
Dmitriy Zaporozhets ab129f7b23 Improve profile page UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-03 14:00:41 +01:00
Jacob Vosmaer 2674a14bec Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into spread-runner-last-updated-at 2015-11-03 13:48:57 +01:00
Dmitriy Zaporozhets e3aed91219 Better name for up-level links
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-03 13:22:11 +01:00
Kamil Trzciński 86c0d8d289 Merge branch 'only-syntax' into 'master'
Extend yml syntax for only and except to support specifying repository path

This allows to limit execution of jobs to specific repository.

For example:
```yaml
job:
  only:
    - branches@gitlab-org/gitlab-ce
  except:
    - master@gitlab-org/gitlab-ce
```

The above will run `job` for all branches on `gitlab-org/gitlab-ce`, except master.

@dzaporozhets @JobV @vsizov Please review.


See merge request !1720
2015-11-03 12:13:21 +00:00
Kamil Trzcinski 8d2758e02d Cleanup stuck CI builds daily 2015-11-03 13:12:16 +01:00
Dmitriy Zaporozhets 819cfcef59 Merge branch 'fix-inflector' into 'master'
Remove inflector rule that makes commits uncountable

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

Before: 

```
>> "commits".singularize
=> "commits"
>> "commit".pluralize
=> “commits”
```

After: 

```
>> "commits".singularize
=> "commit"
>> "commit".pluralize
=> “commits”
```

cc @rspeicher 

See merge request !1726
2015-11-03 12:04:22 +00:00
James Lopez 1b14bc5957 refactored permissions and added update_project_member ability logic. Also refactored owner methods to a concern. 2015-11-03 11:11:56 +00:00