home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 09:36:47 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sytse Sijbrandij 78171d5481 Prevent people from adding the link back. 2015-11-06 18:25:41 -08:00
Baldinof e34904370f Merge button has color from CI status 2015-11-06 23:45:33 +01:00
Stan Hu 8f2561b193 Add spec for manual merge of merge request 2015-11-06 10:48:25 -08: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
Dmitriy Zaporozhets 14518ba65a Better english 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-06 15:48:18 +01:00
Dmitriy Zaporozhets 6f15356aea Add tests to release notes feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-06 15:43:59 +01:00
Dmitriy Zaporozhets cb8b9c3fe2 Add association and validation for Release model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-06 15:29:04 +01:00
Dmitriy Zaporozhets 962b57df5a Small UI improvements to new git tag page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-06 15:05:19 +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 b60ad399ac Fix test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-06 14:47:29 +01:00
Dmitriy Zaporozhets c1a893d91a Fix list rendering issue when dropdown was hidden in row 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-06 14:44:46 +01:00
Dmitriy Zaporozhets ed757ef6e3 Rewrite remove tag test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-06 14:44:08 +01:00
Dmitriy Zaporozhets cea2afa85e Add changelog item and remove release labels for tags list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-06 14:15:27 +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
Stan Hu 40a9b1ce00 Fix bug where manually merged branches in a MR would end up with an empty diff 
Closes #3314
 2015-11-05 23:47:04 -08:00
Sytse Sijbrandij c468461579 Only have one link in emails to make clicking it easier. 2015-11-05 21:17:15 -08:00
Tomasz Maczukin e40c13ae48 Merge branch 'master' into fix/visibility-level-setting-in-forked-projects 
* master:
  Add CI permissions and api links to README [ci skip]
  Remove duplicate documentation links
  make migrations reversible
  Add missing stage to builds view
  CI details cleanup
  Allow groups to appear in the search results if the group owner allows it
  Update installation.md
  update example of regex for pytest-cov
 2015-11-06 00:52:55 +01: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 3c0244d3d1 Retyle tag show page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-05 18:37:31 +01:00
Dmitriy Zaporozhets 900419c43c Improve UI for tags page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-05 17:08:47 +01:00
Kamil Trzcinski b18671a1b2 Enable shared runners for all new projects 2015-11-05 17:02:02 +01: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
Dmitriy Zaporozhets 26677fbe21 After tag is created - redirect to tag page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-05 14:07:55 +01:00
Dmitriy Zaporozhets 312cf11b61 Add release description to new tag form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-05 14:03:48 +01:00
Dmitriy Zaporozhets 850bb21b12 Create show page for tag and render release notes there and on index page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-05 13:49:34 +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
Dmitriy Zaporozhets a4d75e3aec Add ability to edit and show release notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-05 12:15:25 +01:00
Dmitriy Zaporozhets ba67af79a9 More release related logic to separate resource 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-05 11:16:41 +01:00
Dmitriy Zaporozhets 1c4d1c3bd6 Add release model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-05 11:03:02 +01:00
Dmitriy Zaporozhets 33b8f00263 Add edit/update tag actions for future release notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-05 10:51:12 +01: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