cf70e64955
Merge pull request #9805 from mutec/patch-1
...
fixed typo in installation manual
2015-11-04 23:12:26 +01:00
95da91a66d
Use single spaces
2015-11-04 17:07:21 +00:00
07821839d0
Update installation.md
2015-11-04 17:49:23 +01:00
5df6b0b758
Merge branch 'facebook-auth' into 'master'
...
Add Facebook authentication
See merge request !1740
2015-11-04 15:23:38 +00:00
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
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
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
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
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
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
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
d09d62b6b8
Replace all usages of `git` command with configurable binary path
...
Closes #3311
2015-11-03 17:11:09 -05:00
312375ac7c
Update Shell Commands doc for configurable git binary path
2015-11-03 17:10:17 -05:00
05eb9e7884
Minor reformatting for Facebook integration doc
...
[ci skip]
2015-11-03 16:16:30 -05:00
98dcad2762
Use proper labels for OAuth providers
2015-11-03 17:59:07 +01:00
4773d98e83
Add Facebook authentication
2015-11-03 17:59:07 +01:00
700909d567
Bump stamp to ~> 0.6.0
...
Closes #2801
2015-11-03 11:48:05 -05:00
482a17089f
Merge branch 'improve-profile-page'
2015-11-03 17:33:29 +01:00
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
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
e0edc01d14
Fix tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-03 16:39:09 +01:00
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
7d0d60d324
Merge branch 'go-to-nav'
2015-11-03 15:52:27 +01:00
00ac792cfb
Fix clipboard button overflow
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-03 15:44:52 +01:00
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
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
b12e17ff55
Merge branch 'web_hook_repo_changes'
2015-11-03 15:05:50 +02:00
ab129f7b23
Improve profile page UI
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-03 14:00:41 +01:00
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
e3aed91219
Better name for up-level links
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-03 13:22:11 +01:00
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
8d2758e02d
Cleanup stuck CI builds daily
2015-11-03 13:12:16 +01:00
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
d23ffc832c
Fix code that depends on incorrect inflector behavior
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-03 12:00:27 +01:00
a2f8f9ad3d
Fixed User sorting specs
...
The descriptions were not accurate and one particular spec seemingly
expected the wrong User row to be returned.
2015-11-03 11:56:04 +01:00
732f5380af
Only sort by IDs by default
...
Sorting by both "created_at" and "id" in descending order is not needed
as simply sorting by "id" in descending order will already sort rows
from new to old. Depending on the query and data involved sorting twice
can also introduce significant overhead.
2015-11-03 11:54:43 +01:00
0df65909ef
Added benchmark for User.all
...
This benchmark exists to test if ordering has any noticeable impact in
the test environment.
2015-11-03 11:47:23 +01:00
8a22b5bf54
Remove inflector rule that makes commits uncountable
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-03 11:36:20 +01:00
fb2f8be4d7
Merge branch 'olhado/gitlab-ce-commit-search'
2015-11-03 11:28:56 +01:00
d0e74f49b4
Merge branch 'new-file-link' into 'master'
...
Add 'New file' link to dropdown on project page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Screenshot:
Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2562
See merge request !1719
2015-11-03 10:26:16 +00:00
9479496f75
Add added, modified and removed properties to commit object in webhook
2015-11-03 12:16:40 +02:00
fe34b745e7
Fix tests
2015-11-03 11:05:54 +01:00
b9e53258c5
Merge branch 'update-links-to-ci-status' into 'master'
...
Update links in CI docs after GitLab 8.1
Fix that some links to CI status in docs were broken even after following redirects.
As CI build overview is now missing (cf. #3008 ), this MR uses `?scope=all` parameter.
See merge request !1733
2015-11-03 09:51:47 +00:00
28f6fba97c
Fix commits search for empty repository
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-03 10:16:09 +01:00
d0398514b8
Add 'New file' link to dropdown on project page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-03 09:21:35 +01:00
57430dc4da
Merge branch 'rs-require-backup-files' into 'master'
...
Explicitly require backup/files
Fixes a test failure we were seeing on CI after merging !1520
See merge request !1731
2015-11-03 08:16:44 +00:00
aa27108e6b
Merge pull request #9791 from konpyu/fix-deprecated
...
Fix deprecated `prepend_before_filter` -> `prepend_before_action`
2015-11-02 23:47:37 -08:00
f61aa9acdc
Update links in CI docs after GitLab 8.1
2015-11-03 14:01:27 +09:00
60c5b52ee9
Explicitly require backup/files
2015-11-02 15:04:43 -05:00
5782217bfc
Merge branch 'api_file_touched_at' into 'master'
...
Add ability to fetch the commit ID of the last commit that actually touched a file
https://dev.gitlab.org/gitlab/gitlabhq/issues/2564
See merge request !1718
2015-11-02 17:58:32 +00:00
Robert Schilling