home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,056 Commits 48 Branches 340 Tags
8d8b457cebdfd0790157cd54fd1f24e46fbf0785
Commit Graph
25056 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
connorshea 8d8b457ceb Add SCSS Lint, CSSComb config file, run SCSS Lint in GitLab CI, add documentation for SCSS Style Guide. 
See !3069 for more information.
 2016-03-14 20:33:54 -06:00
Jacob Schatz 3ed8a8e52c Merge branch 'search-results-filter-dropdown' into 'master' 
Improved search results filter dropdown

## Current

Currently filter dropdowns on search results page can be **very** long and off the page

![Screen_Shot_2016-03-11_at_15.25.24](/uploads/3418b0a6f4f8a0a8bd2441b53502c574/Screen_Shot_2016-03-11_at_15.25.24.png)

## New

Changed over to the new dropdown

![Screen_Shot_2016-03-11_at_15.29.06](/uploads/2d3a4a9b3e50f3e0fc1748a026cd5905/Screen_Shot_2016-03-11_at_15.29.06.png)

See merge request !3183
 2016-03-11 17:13:09 +00:00
Patricio Cano 6bc7fad8ea Merge branch 'omniauth-saml-upgrade' into 'master' 
Upgrade `omniauth-saml` to 1.5.0 and document it's new capabilities.

With this MR I'm upgrading `omniauth-saml` to 1.5.0 to include new and improved functionality. See https://github.com/omniauth/omniauth-saml/blob/master/CHANGELOG.md for more details.

This MR includes new documentation, so @axil can you also take a look?

/cc @DouweM 

See merge request !3170
 2016-03-11 16:48:52 +00:00
Patricio Cano 95e73f87a9 Doc syntax fixes 
[ci skip]
 2016-03-11 11:47:34 -05:00
Phil Hughes 9f8661987d Increased dropdown max height 2016-03-11 16:30:58 +00:00
Jacob Schatz 6968ea32e2 Merge branch 'award-emoji-design-update' into 'master' 
Updated UI of award emoji

Closes #13878 

See merge request !3028
 2016-03-11 16:06:18 +00:00
Phil Hughes 6c69868cfc Improved search results filter dropdown 2016-03-11 15:29:29 +00:00
Douwe Maan 5a84e8381a Merge branch 'remove-benchmark-suite' into 'master' 
Removed benchmark suite and its documentation

Related issue: gitlab-org/gitlab-ce#13718

See merge request !3137
 2016-03-11 15:06:37 +00:00
Douwe Maan c814421f2a Merge branch 'update-gitlab-git' into 'master' 
Updated gitlab_git to 9.0.1

This includes gitlab-org/gitlab_git!69 and will hopefully solve
gitlab-org/gitlab-ce#13808.

See merge request !3123
 2016-03-11 15:05:51 +00:00
Jacob Schatz 29ac9f64ea Merge branch 'fix-issue-toggle-button-mobile' into 'master' 
Fixes issue with issue sidebar toggle button not working

Closes #14195

See merge request !3165
 2016-03-11 13:09:54 +00:00
Jacob Schatz cec88d81bb Merge branch 'account-settings' into 'master' 
Account settings

Closes #13854

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4802a7b4f74f17d25a611ed1a2200445/account-settings.png)

See merge request !3039
 2016-03-11 13:08:40 +00:00
Jacob Schatz d343c7a159 Merge branch 'comment-discard-button' into 'master' 
Added discard button to comment form

Also changed the labels on the buttons to better match the action they are completing.

Closes #8057

See merge request !3085
 2016-03-11 13:07:43 +00:00
Dmitriy Zaporozhets 1f08363650 Merge branch 'comment-error' into 'master' 
Add error for ajax:error when submitting comments

Fixes #13814
![Screen_Shot_2016-02-25_at_1.54.56_PM](/uploads/d70d706d306079df1b00d70f09affb63/Screen_Shot_2016-02-25_at_1.54.56_PM.png)
cc @dblessing 

See merge request !2976
 2016-03-11 13:00:59 +00:00
Kamil Trzciński 1cdc355a0f Merge branch 'gitlab-ci-yaml-alias' into 'master' 
Support YAML alias/anchor usage in .gitlab-ci.yml

This allows to reuse one job as a template for another one:

```
job1: &JOBTMPL
  script: execute-script-for-job

job2: *JOBTMPL

```

This also helps to solve some of the issues in gitlab-org/gitlab-ci#342

See merge request !2958
 2016-03-11 12:04:32 +00:00
Jacob Schatz 0c5b92cbd7 Merge branch 'build-scroll-controls-position' into 'master' 
Affix the build scroll controls

Closes #4709

See merge request !3109
 2016-03-11 11:19:27 +00:00
Phil Hughes 6690d8e25b Correctly uses a variable with the text 2016-03-11 10:03:35 +00:00
Phil Hughes c9b62662cc Used standard variable colours 2016-03-11 09:51:07 +00:00
Phil Hughes a9d97838a3 Added back 2fa configure later button 2016-03-11 09:51:07 +00:00
Phil Hughes 218f3e702a Moved 2fa into separate view 2016-03-11 09:51:07 +00:00
Phil Hughes c4baf2417f Fixed issue with 2fa not enabling 
Added in disable button for 2fa
 2016-03-11 09:51:07 +00:00
Phil Hughes 4d4573268e Fixed heading weight issue 
Moved colours to variables
 2016-03-11 09:51:07 +00:00
Phil Hughes 9dc71dcaa0 Updated CHANGELOG 2016-03-11 09:51:07 +00:00
Phil Hughes d5f145bf8b Fixed failing tests 2016-03-11 09:51:07 +00:00
Phil Hughes f48f51ac7e Account settings 
Closes #13854
 2016-03-11 09:51:07 +00:00
Phil Hughes 25f392eab7 Added 'surprise' animation 2016-03-11 09:47:47 +00:00
Phil Hughes 57a9d07716 Fixed bug with emoji search styling 2016-03-11 09:11:36 +00:00
Phil Hughes cb72f9b30c CoffeeScript style improv. 2016-03-11 09:03:08 +00:00
Phil Hughes bfa6064dc9 Award emoji button padding 2016-03-11 09:03:08 +00:00
Phil Hughes fc79fe7b53 Renamed variables & removed some for award emoji 2016-03-11 09:03:08 +00:00
Phil Hughes b5f3cf8218 Moved method calls to separate lines 2016-03-11 09:03:08 +00:00
Phil Hughes e3d844984b Moved SCSS values into variables 2016-03-11 09:03:08 +00:00
Phil Hughes a7e76a6119 Updated award emoji tests 2016-03-11 09:02:43 +00:00
Phil Hughes 5e145918b4 Updated UI of award emoji 
Closes #13878
 2016-03-11 09:02:43 +00:00
Phil Hughes 732b6b5547 Fixed missing variables 2016-03-11 09:00:19 +00:00
Phil Hughes 07e1754c7c Removed deprecated bootstrap classes 2016-03-11 08:57:53 +00:00
Robert Speicher f7da99aef7 Merge branch 'webhooks' into 'master' 
Change all instances of "web hooks" to "webhooks"

See merge request !3169
 2016-03-10 23:09:52 +00:00
Patricio Cano e4237f1fe3 Consistently use the same hash syntax in the new documentation. 2016-03-10 16:52:52 -05:00
Patricio Cano 32ddf092f3 Upgrade omniauth-saml to 1.5.0 and document it's new capabilities. 2016-03-10 16:07:10 -05:00
Rémy Coutable e0b6ad8d61 Add 8.5.5 CHANGELOG items 
[ci skip]
 2016-03-10 21:59:52 +01:00
Robert Speicher 444c6295ba Fix help_autocomplete alignment 
OCD hooooooooo!

[ci skip]
 2016-03-10 15:24:37 -05:00
Jacob Schatz 2d83f07ba8 Merge branch 'issue_13987' into 'master' 
Fixes broken layout of web editor page on mobile

Fixes #13987 

<p><img src="https://gitlab.com/gitlab-org/gitlab-ce/uploads/3a58e7b576c25d5929bc1cdcbe163161/Screen_Shot_2016-03-10_at_1.13.19_PM.png" alt="Screen_Shot_2016-03-10_at_1.13.19_PM" width="487"></p>

See merge request !3167
 2016-03-10 20:13:32 +00:00
ashleys 4cd9a5208c web hooks to webhooks 2016-03-10 14:48:29 -05:00
Alfredo Sumaran bfcf6a045c Use full URL to reference issues 2016-03-10 14:31:21 -05:00
Robert Speicher b886d833d3 Merge branch 'markdown-parser-documentation' into 'master' 
Adds mention of Redcarpet as Markdown parser in docs

It makes it easier for users to find the source of issues related to
Markdown parsing.

[ci skip]

See merge request !3168
 2016-03-10 19:25:31 +00:00
A. Felipe Cabargas Madrid b04020506d Capitalize Rouge mentions 2016-03-10 16:12:50 -03:00
A. Felipe Cabargas Madrid 43a4762d50 Capitalize names of technologies 2016-03-10 16:11:59 -03:00
A. Felipe Cabargas Madrid c548795084 Added redcarpet usage reference to markdown documentation 2016-03-10 16:01:58 -03:00
Robert Speicher 5c1dba671d Merge branch 'issue-mr-build-status-placement' into 'master' 
Moves build status tooltip on issues

See merge request !3156
 2016-03-10 18:52:33 +00:00
Jacob Schatz e1f9f69cb2 Merge branch 'slang/gitlab-ce-rewrite-logo' into 'master' 
rewrite logo to simplify SVG code

_Originally opened at !3129 by @slang._

- - -

The look of the logo is obviously unchanged... This just gets rid of some useless SVG groups that Sketch made.

See merge request !3164
 2016-03-10 18:50:07 +00:00
Douwe Maan 57142014e8 Merge branch 'expiring-lock' into 'master' 
Use an exclusive lease for LDAP checks

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14134

Merge https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3140 first.

Only perform LDAP checks for a user after acquiring a lease. Checks
during user login do not require a lease.

The lease has a fixed expire time of 10 minutes.

See merge request !3143
 2016-03-10 18:30:28 +00:00