Commit Graph
20282 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 4099751ce9 Render same markdown hint for issue, merge request, wiki and comment forms
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-07 20:22:16 +01:00
Robert Schilling e9f3db1558 Merge pull request #9782 from gitlabhq/jvanbaarsen-patch-1
Fixed markdown issue in PROCESS.md
2015-11-07 16:11:49 +01:00
Jeroen van Baarsen 920a2d974c Fixed markdown issue in PROCESS.md 2015-11-07 16:04:57 +01:00
Jeroen van Baarsen 84999611d8 Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-provider
Hide tab-bar in login-box when only one tabs is shown.
2015-11-07 15:41:40 +01:00
Christian Speich b14198a5e7 Hide tab-bar in login-box when only one tabs is shown. 2015-11-07 12:40:14 +01:00
Dmitriy Zaporozhets 0d9fb211f3 Merge branch 'small-ui-improvements' into 'master'
Small UI improvements to merge request page

Make gray block under tabs identical height. Also same height have blocks on pages like `Groups` etc. So this improvement is targeted for consistency in UI too

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

Fixes internal issues 

* https://dev.gitlab.org/gitlab/gitlabhq/issues/2591
* https://dev.gitlab.org/gitlab/gitlabhq/issues/2592

cc @DouweM 


See merge request !1759
2015-11-07 10:43:00 +00:00
Dmitriy Zaporozhets c5ec2a23a4 Small UI improvements to merge request page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-06 16:27:18 +01:00
Robert Schilling f57d59226d Merge pull request #9807 from SkySymbol/fix_line_order
fix line order in installation docs
2015-11-06 14:51:07 +01:00
Dmitriy Zaporozhets b0cb03cd8f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-11-06 14:05:12 +01:00
Dmitriy Zaporozhets f566e6889c Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-11-06 14:05:08 +01:00
Dmitriy Zaporozhets 2765aed62c Merge pull request #9730 from ImanMh/master
ugly outlines removed form sidebar
2015-11-06 14:04:18 +01:00
Dmitriy Zaporozhets 6617094ea2 Merge pull request #9788 from Thirumal-Sakthivel/select_box_ui
form-control class added to select box
2015-11-06 14:03:32 +01:00
Dmitriy Zaporozhets 8e28185b16 Merge branch 'one-link-in-emails' into 'master'
Only have one link in emails to make clicking it easier.



See merge request !1937
2015-11-06 09:05:50 +00:00
Sytse Sijbrandij c468461579 Only have one link in emails to make clicking it easier. 2015-11-05 21:17:15 -08:00
Achilleas Pipinellis 193bc5fb3c Merge branch 'fix_doc_ci_links' into 'master'
Add CI permissions and api links to README



See merge request !1756
2015-11-05 19:27:14 +00:00
Achilleas Pipinellis 5f696d0c22 Add CI permissions and api links to README [ci skip] 2015-11-05 21:23:01 +02:00
Achilleas Pipinellis c55b5c72e9 Remove duplicate documentation links 2015-11-05 21:09:02 +02:00
Dmitriy Zaporozhets 1423284c74 Merge branch 'reversible_migration' into 'master'
Make migrations reversible



See merge request !1753
2015-11-05 15:58:20 +00:00
Douwe Maan ccf5e2d6ba Merge branch 'ci-details' into 'master'
Add some polish to CI integration

Check the list of commits to see what I changed.

cc @dzaporozhets

@rspeicher I'd love to get this into 8.1, since it's mostly refactoring/tweaking of stuff that was _introduced_ in 8.1.

Fixes #2645.

See merge request !1641
2015-11-05 15:23:04 +00:00
Thirumal S 6fcd5127a3 defined class prepend-top-10 used for alignment issue 2015-11-05 20:21:46 +05:30
Valery Sizov aecc4376e2 make migrations reversible 2015-11-05 16:47:25 +02:00
Kamil Trzcinski 2becd53015 Add missing stage to builds view 2015-11-05 15:24:27 +01:00
Kamil Trzcinski ba68facf8d CI details cleanup
- Add page titles to CI settings.
- Fix CI admin navigation.
- Remove duplicated scope.
- Use monospace font for commit sha.
- Add page title and header title to build page.
- Proper authorization for cancel/retry builds.
- Use gitlab pagination theme for builds and group members.
- Don't paginate builds widget on build page.
- Add badges to commit page Changes/Builds tabs.
- Add "Builds" to commit Builds tab page title.
- Add and use Ci::Build#retryable? method.
- Add CI::Build#retried? method.
- Allow all failed commit builds to be retried.
- Proper authorization for cancel/retry all builds.
- Remove unused param.
- Use time_ago_with_tooltip where appropriate.
- Tweak builds index text
- Remove duplication between builds/build and commit_statuses/commit_status.
- Use POST rather than GET for canceling and retrying builds.
- Remove redundant URL helpers.
- Add build ID to build page.
- Link branch name on build page.
- Move commit/:sha/ci to commit/:sha/builds.
2015-11-05 15:24:27 +01:00
Dmitriy Zaporozhets db6cb39963 Merge pull request #9804 from trimentor/9722-fix-alignment-of-event-items-and-its-children
9722 fix alignment of event items and its children
2015-11-05 14:55:42 +01:00
Valery Sizov 4f574388fc Merge branch 'public_groups' into 'master'
Allow groups to appear in the search results if the group owner allows it

https://dev.gitlab.org/gitlab/gitlabhq/issues/2565

See merge request !1751
2015-11-05 11:45:58 +00:00
Valery Sizov 6051c28fc0 Allow groups to appear in the search results if the group owner allows it 2015-11-05 13:18:51 +02:00
Kjel Delaey b6f89c3490 Add right margin to event-body..
Otherwise text will flow under the "timeago" element.
The original value was 80px (see commit 8b0906c8), but a value of 174px
makes more sense. (see event-title `calc` function).
2015-11-05 09:56:51 +01:00
Dmitriy Zaporozhets 363900a3e7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-11-05 09:53:16 +01:00
Achilleas Pipinellis 97f9157de9 Merge branch 'update-ci-settings' into 'master'
update example of regex for pytest-cov



See merge request !1745
2015-11-05 06:42:00 +00: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
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
mozillazg 5f94e130d1 update example of regex for pytest-cov 2015-11-04 11:41:44 +08: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
Thirumal S c12a4b2a31 merge conflict fixed 2015-11-03 22:49:09 +05:30