home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
5948 Commits
Author SHA1 Message Date
Douwe Maan 07c39c9976 Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master' 
Add graphs of commits ahead/behind default branch (by @brunsa2)

Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1716

See merge request !2301
 2016-01-05 15:44:22 +00:00
Douwe Maan 7c3c901ada Merge branch 'joshfng/gitlab-ce-fix-3802' into 'master' 
Show 'New Merge Request' buttons on canonical repo. (by @joshfng)

Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2189 to run tests on our runners.

See merge request !2300
 2016-01-05 15:12:35 +00:00
Dmitriy Zaporozhets e6713cd945 Merge branch 'improved-leave-project' into 'master' 
Adds settings menu to the top for editting and leaving projects

@creamzy @skyruler @dzaporozhets 
Menu contents depends on user's rights.

Fixes #4221


![Screen_Shot_2015-12-23_at_10.02.47_PM](/uploads/daeaef937bf9d9f4db7ccb674e344ac1/Screen_Shot_2015-12-23_at_10.02.47_PM.png)
![Screen_Shot_2015-12-23_at_10.02.41_PM](/uploads/58eb4eea7d640f01d7f05c2a408a2c04/Screen_Shot_2015-12-23_at_10.02.41_PM.png)
![Screen_Shot_2015-12-23_at_10.02.55_PM](/uploads/4b2ae027a13efcbad3eb81b04f134c4f/Screen_Shot_2015-12-23_at_10.02.55_PM.png)
![Screen_Shot_2015-12-23_at_10.04.47_PM](/uploads/bd5d9d8ddd72d16d74c32c6c1f569776/Screen_Shot_2015-12-23_at_10.04.47_PM.png)


See merge request !2195
 2016-01-05 09:34:13 +00:00
Dmitriy Zaporozhets 525f8fb4fb Merge branch 'rs-logo-animation' into 'master' 
Use the logo as a loading indicator

![logo-sweep](/uploads/ff048fd2e56a6dcae8801f998b484623/logo-sweep.gif)

See merge request !2277
 2016-01-05 09:30:09 +00:00
Robert Speicher b807a23b4b Redesign the AbuseReports index 
- Shows when the reported user joined
- Show relative timestamp for when the report was created
- Parse message with restricted Markdown pipeline to autolink URLs
 2016-01-04 18:36:38 -05:00
Robert Speicher 7df3c1e8ea Correct the logo ID names 
Her left, not ours!
 2016-01-04 14:54:56 -05:00
Robert Speicher 6f4ea679d9 Merge branch 'show-all-builds-by-default' into 'master' 
Show all builds by default in the builds page

Fixes #4240 

See merge request !2243
 2016-01-04 18:42:37 +00:00
Jacob Schatz 712af98e9c removes footer message about access to project 2016-01-04 09:07:50 -05:00
Valery Sizov 8b18449125 remove public field from namespace and refactoring 2016-01-04 16:00:29 +02:00
Douglas Barbosa Alexandre 567dc62b6d Show 'All' tab by default in the builds page 2016-01-04 10:21:10 -02:00
Dmitriy Zaporozhets b9ec1aaec8 Merge branch 'rs-delimit-all-the-things' into 'master' 
number_with_delimiter most of the things



See merge request !2258
 2016-01-04 10:36:54 +00:00
Dmitriy Zaporozhets 57377376cc Merge branch 'rs-abuse-report-form' into 'master' 
Add js-requires-input and js-quick-submit to abuse report form



See merge request !2245
 2016-01-04 10:28:09 +00:00
Dmitriy Zaporozhets f8696018cc Merge branch 'expire-cache-on-app-settings-change' into 'master' 
Expire view caches when application settings change

If the admin disables Gravatar, for example, before the views would not invalidate. Now they invalidate automatically when this happens.

Closes #5728

See merge request !2280
 2016-01-04 09:41:28 +00:00
Josh Frye edd2ce3836 Change text back. Add additional tests. 2016-01-03 18:12:27 -05:00
Josh FryeandJosh Frye 95e6327b85 Fix tests 2016-01-03 18:12:27 -05:00
Josh FryeandJosh Frye 8bfc46451e Show 'New Merge Request' buttons on canonical repo. 2016-01-03 18:12:27 -05:00
Dmitriy Zaporozhets bfb3c8d936 Merge branch 'rs-safari-version-check' into 'master' 
Don't attempt to set Referrer policy in Safari

While Safari supports the policy, it does not (currently, as of 9.x)
recognize `origin-when-cross-origin` as a valid value, so we omit the
policy entirely under Safari.

Closes #5609

See merge request !2269
 2016-01-03 19:23:30 +00:00
Stan Hu 2802d4992d Expire view caches when application settings change 
Closes #5728
 2016-01-03 11:20:14 -08:00
Robert Speicher c80f75ea1f Give the logo shapes meaningful IDs 2016-01-02 15:29:55 -05:00
Steffen Köhler 74969021ef Fix typo in CI settings 
[ci skip]
 2016-01-01 13:34:24 +01:00
Robert Speicher 9a9a81bea0 Don't attempt to set Referrer policy in Safari 
While Safari supports the policy, it does not (currently, as of 9.x)
recognize `origin-when-cross-origin` as a valid value, so we omit the
policy entirely under Safari.

Closes #5609
 2015-12-31 20:44:55 -05:00
Robert Speicher bf249550d0 number_with_delimiter most of the things 2015-12-31 20:04:23 -05:00
Zeger-Jan van de WegandRobert Speicher 1be406d741 Swap Author and Assignee Selectors on issuable index view 
Closes #4039
 2015-12-30 18:21:53 -05:00
Robert Speicher c479dbae22 Add js-requires-input and js-quick-submit to abuse report form 2015-12-30 15:37:09 -05:00
Yorick Peterse 620e7bb3d6 Write to InfluxDB directly via UDP 
This removes the need for Sidekiq and any overhead/problems introduced
by TCP. There are a few things to take into account:

1. When writing data to InfluxDB you may still get an error if the
   server becomes unavailable during the write. Because of this we're
   catching all exceptions and just ignore them (for now).
2. Writing via UDP apparently requires the timestamp to be in
   nanoseconds. Without this data either isn't written properly.
3. Due to the restrictions on UDP buffer sizes we're writing metrics one
   by one, instead of writing all of them at once.
 2015-12-29 14:53:45 +01:00
Dmitriy Zaporozhets 58bc4b72d5 Merge branch 'feature/recaptcha_settings' into 'master' 
Makes reCAPTCHA configurable through Application Settings screen

Following the work made by @stanhu here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2216, made it configurable without needing to restart Gitlab

See merge request !2231
 2015-12-29 09:39:54 +00:00
Robert Speicher f0ecd69be5 Merge branch 'fix-spelling-mistake' into 'master' 
Fix spelling mistake, thanks Connor.

[ci skip]

See merge request !2227
 2015-12-29 00:13:16 +00:00
Jacob Schatz c6c96708b5 Merge branch 'master' into improved-leave-project 2015-12-28 17:08:12 -05:00
Gabriel Mazetto a3469d914a reCAPTCHA is configurable through Admin Settings, no reload needed. 2015-12-28 18:50:29 -02:00
Jacob Schatz 8ee6abaaf4 fixes tests failing 2015-12-28 14:45:23 -05:00
Jacob Schatz eb162c2b27 adds settings menu to the top for editting and leaving projects 2015-12-28 14:45:23 -05:00
Yorick Peterse 4d925f2147 Move InfluxDB settings to ApplicationSetting 2015-12-28 18:00:32 +01:00
Sytse Sijbrandij 4465e2eca0 Fix spelling mistake, thanks Connor. 2015-12-28 17:08:15 +01:00
Dmitriy Zaporozhets 2978be2e22 Merge branch 'rs-fix-shortcut-help' into 'master' 
Fix the "Show all" link for the keyboard shortcut modal

18cb430f79 introduced a typo that made this stop working.

See merge request !2218
 2015-12-28 12:02:18 +00:00
Stan Hu 4c6591c922 Make sign-up form retain fields after failed CAPTCHA test 2015-12-27 19:47:21 -08:00
Robert Speicher e7314e4c27 Fix the "Show all" link for the keyboard shortcut modal 2015-12-27 20:34:46 -05:00
Stan Hu 9f7d379c2a Add support for Google reCAPTCHA in user registration to prevent spammers 2015-12-27 09:04:11 -08:00
Robert Speicher 98f77d2edc Merge branch 'close-open-ajax-issue' into 'master' 
open and close issue via ajax request. With tests

Close and Reopen issues with ajax request.

See merge request !2164
 2015-12-25 21:00:16 +00:00
Dmitriy Zaporozhets fd231ff9fb Merge branch 'revert_votes_back' into 'master' 
Revert vote buttons back to issue and MR pages

https://gitlab.com/gitlab-org/gitlab-ce/issues/3672



/cc @dzaporozhets @JobV 


![joxi_screenshot_1450809309400](/uploads/379a75505e0d5f24e743aa0a6a6684e2/joxi_screenshot_1450809309400.png)


See merge request !2206
 2015-12-25 15:52:06 +00:00
Douwe Maan 7d5b51f387 Merge branch 'rs-opengraph' into 'master' 
Add Open Graph meta tags



See merge request !2192
 2015-12-25 13:41:55 +00:00
Douwe Maan 6d385e3365 Add link to twitter docs 2015-12-25 13:38:54 +01:00
Douwe Maan 0980dda6cd Add more twitter metatags. 2015-12-25 13:35:57 +01:00
Douwe Maan 4a2514ff0e Add og:site_name 2015-12-25 13:27:43 +01:00
Valery Sizov 195dc3a746 add sorting of awards 2015-12-25 14:11:19 +02:00
Robert Speicher ab3d855c0e Add support for twitter:label meta tags 2015-12-24 17:11:08 -05:00
Robert Speicher 99dc1fce5e Use request.fullpath for og:url tag 2015-12-24 16:53:35 -05:00
Gabriel Mazetto cde06999c9 Add to application_settings forced TFA options 2015-12-24 19:01:30 -02:00
Gabriel Mazetto 31fb2b7702 Grace period support for TFA 2015-12-24 19:01:30 -02:00
Stan Hu 8309ef45a9 Enable "Add key" button when user fills in a proper key 
Closes #4295
 2015-12-24 11:34:32 -08:00
Dmitriy Zaporozhets 1a23af485c Merge branch 'fix-explore-ui' into 'master' 
Fix explore projects page UI

# Before

![Screenshot_2015-12-24_14.13.03](/uploads/fdae7648acc8b8076709e4bfc867a5f8/Screenshot_2015-12-24_14.13.03.png)


# After

![Screenshot_2015-12-24_14.11.29](/uploads/b1ecd3bebfadab9d2ceabaae27046271/Screenshot_2015-12-24_14.11.29.png)



cc @jschatz1 @skyruler 


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


See merge request !2202
 2015-12-24 15:05:28 +00:00