root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
18,891 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

18891 Commits

Author SHA1 Message Date
Dmitriy Zaporozhets db197aa61a Fix tests and improve wording 2015-09-14 14:16:08 +02:00
Kamil Trzcinski f31d8ef287 Merge commit '4c53cc0ebac36560d806732ff1fefba9206c75f3' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 
* commit '4c53cc0ebac36560d806732ff1fefba9206c75f3':
  rubocop satisfy

Conflicts:
	app/controllers/ci/builds_controller.rb
	app/controllers/ci/commits_controller.rb
 2015-09-14 14:04:08 +02:00
Kamil Trzcinski 1ce85dc4e2 Fix navigation and header tile 
Remove redundant navigation on commits and builds page
 2015-09-14 14:03:02 +02:00
Kamil Trzcinski d0b9a6fca2 Make commits to hover when going to commits and builds 2015-09-14 14:02:16 +02:00
Kamil Trzcinski 81560ab259 Fix build triggers URL and slack notifications 2015-09-14 14:01:17 +02:00
Kamil Trzcinski d0019456cd Fix runners administration 2015-09-14 14:00:53 +02:00
Kamil Trzcinski 40ccef76c9 Fix h3 page titles for triggers, variables and web hooks 2015-09-14 14:00:20 +02:00
Kamil Trzcinski ec91340240 Remove duplicate notices 2015-09-14 13:59:19 +02:00
Kamil Trzcinski 09bd8a8b0d Fix navigation 2015-09-14 13:58:38 +02:00
Kamil Trzcinski b15fcd4056 Remove unused user_sessions 2015-09-14 13:57:43 +02:00
Valery Sizov 4c53cc0eba rubocop satisfy 2015-09-14 14:37:18 +03:00
Dmitriy Zaporozhets b8225324ef Hide group sidebar menu if user cant access it 2015-09-14 12:46:24 +02:00
Hannes Rosenögger 661e317229 Merge branch 'latest_tag_patch_release' into 'master' 
Add LATEST_TAG variable to automatically fetch the latest tag

Add LATEST_TAG variable to automatically fetch the latest tag

Replaces !1241

See merge request !1287
 2015-09-14 10:37:00 +00:00
Dmitriy Zaporozhets 66840f03cc Fix tests for group access 2015-09-14 12:15:11 +02:00
Dmitriy Zaporozhets 1d2173819b Show activity/projects depends on access 2015-09-14 11:41:19 +02:00
Dmitriy Zaporozhets 548d20e895 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-09-14 11:33:01 +02:00
Kamil Trzcinski 95037c9c55 Revert "monkey patch of Hash" 
This reverts commit 6014019ed4.
 2015-09-14 11:27:30 +02:00
Kamil Trzcinski 16e44ad7fc Fix IOError when fetching a new build by runner 2015-09-14 11:27:25 +02:00
Dmitriy Zaporozhets 4e1c6019c8 Allow access to group from root url 2015-09-14 11:16:54 +02:00
Valery Sizov 6014019ed4 monkey patch of Hash 2015-09-14 12:06:52 +03:00
Dmitriy Zaporozhets 4c060074b7 Skip auth for group page but return auth for other group pages 2015-09-14 11:05:23 +02:00
Valery Sizov 25149ce47e Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' of gitlab.com:gitlab-org/gitlab-ce into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-14 11:16:56 +03:00
Valery Sizov ad5d2c3e78 fix of API 2015-09-14 11:15:54 +03:00
Job van der Voort a2ca53c51d Merge branch 'issues-database' into 'master' 
added note about Issues stored in the database

Because of tweet https://twitter.com/galstar/status/637981324117020672


See merge request !1930
 2015-09-14 08:12:11 +00:00
Achilleas Pipinellis 0ced0ace28 Add LATEST_TAG variable 2015-09-14 09:54:38 +03:00
karen Carias 8e523f49a0 added note 2015-09-13 21:27:29 -07:00
Drew Blessing f07fabc1cd Keep add-diff-note button the same size on hover. Fixes #2497 2015-09-12 09:50:44 -05:00
Job van der Voort d6697bbd94 Merge branch 'improve-error-message' into 'master' 
Improve english of error message

See merge request !1284
 2015-09-12 12:59:57 +00:00
Robert Schilling 001738e992 Improve english of error message 2015-09-12 14:01:01 +02:00
Dmitriy Zaporozhets 15eeae5fa8 Fix 500 when search for gitlab projects 2015-09-11 19:59:39 +02:00
Dmitriy Zaporozhets 2b683807b5 Use GitLab UI when render CI 2015-09-11 19:25:53 +02:00
Dmitriy Zaporozhets 5fcfba2780 Merge branch 'dashboard-titles' into 'master' 
Clean up overlap between dashboard and explore

- Clean up overlap between dashboard and explore. ... 5d785457
  - Split up SnippetsController into separate dashboard and explore sections.
  - Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not.
- Consistently case `Back to X` links. 260fcd45
- Link to help from signin page bottom. d92696d3
- Make Help accessible for guests. c258e977

cc @dzaporozhets

See merge request !1260
 2015-09-11 14:36:56 +00:00
Dmitriy Zaporozhets e3c30bf2e8
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-11 16:32:11 +02:00
Dmitriy Zaporozhets cd606e1790 Remove kaminari views moved from CI 2015-09-11 14:43:51 +02:00
Dmitriy Zaporozhets ec8e2463db Remove db/ci 2015-09-11 14:38:34 +02:00
Dmitriy Zaporozhets 7ba5e4333b Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' of gitlab.com:gitlab-org/gitlab-ce into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-11 14:33:03 +02:00
Dmitriy Zaporozhets ae83051ef9 Fix CI admin projects page 2015-09-11 13:43:37 +02:00
Valery Sizov 77bda265f4 Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' of gitlab.com:gitlab-org/gitlab-ce into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-11 14:41:26 +03:00
Valery Sizov d1914c1e1f admin fix 2015-09-11 14:40:57 +03:00
Dmitriy Zaporozhets 2ed2ef9210 Remove network from CI 2015-09-11 13:38:37 +02:00
Dmitriy Zaporozhets 187face620 CLeanup CI helpers since we dont use oauth any more 2015-09-11 13:15:18 +02:00
Dmitriy Zaporozhets ae5d2f5b31 Fix Ci::Ansi2html spec 2015-09-11 13:10:37 +02:00
Dmitriy Zaporozhets 0615de013d Fix ci commits features specs 2015-09-11 13:05:31 +02:00
Dmitriy Zaporozhets a8dd4d36e2 Fix build features specs 2015-09-11 12:52:56 +02:00
Douwe Maan 4f461fd45f Merge branch 'rs-fix-highlighting' into 'master' 
Syntax highlighting improvements

On the server side:

During development I would occasionally see SanitizationFilter sanitizing
the result of SyntaxHighlightFilter, even though its attributes were
whitelisted. This updates the `clean_spans` transformer to return the
whitelisted node as [suggested by the Sanitize docs](http://git.io/vZR8i).

On the client side:

- Makes the syntax_highlight JS more flexible
- Adds JS specs
- Simplifies highlighting of new notes
- Adds highlighting to Markdown preview

See merge request !1278
 2015-09-11 08:47:13 +00:00
Stan Hu 9995f0806b Import forked repositories asynchronously to prevent large repositories from timing out 
Use import_status to track async import status and give feedback to the user

Closes #2388
Closes #2400
 2015-09-11 00:34:04 -07:00
Robert Speicher a5bb85f8a2 Merge branch 'rescue-syntax-highlighting-errors-updated' into 'master' 
Add comments and clean up test for !1274

See merge request !1279
 2015-09-10 22:30:21 +00:00
Stan Hu 267687993a Add comments and clean up test for !1274 2015-09-10 14:24:10 -07:00
Robert Schilling 7904a751f4 Merge branch 'fix-rouge-warning-noise' into 'master' 
Bump rouge to 1.10.1 to remove warning noise and fix other syntax highlighting bugs

rouge warnings begone!

Closes #2128

Closes #2433

See merge request !1277
 2015-09-10 21:03:36 +00:00
Stan Hu e20529cec4 Bump rouge to 1.10.1 2015-09-10 13:38:43 -07:00