summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Moved the "import" button next to the "Add to project" button25985-combine-members-and-groups-settings-pagesJose Ivan Vargas2017-01-064-3/+6
* Fixed a test and change the arrow functions to named functionsJose Ivan Vargas2017-01-042-5/+5
* Added UX improvementsJose Ivan Vargas2017-01-032-23/+21
* Fixed es6 lint errors, and reverted a change to a helperJose Ivan Vargas2017-01-034-9/+8
* Added CHANGELOGJose Ivan Vargas2017-01-031-0/+5
* Fixed testsJose Ivan Vargas2017-01-031-3/+3
* Updated the "users" to "members" matches in the viewJose Ivan Vargas2017-01-037-13/+12
* Updated some tests descriptions to represent the correct settings pathJose Ivan Vargas2017-01-034-10/+6
* Added tests for the MembersController and corrected some more testsJose Ivan Vargas2017-01-032-1/+15
* Removed the "Groups" option from the settings gearJose Ivan Vargas2017-01-037-18/+15
* Added groups to members section, added a members finderJose Ivan Vargas2017-01-037-20/+35
* Fixed more rspec tests as well as spinach featuresJose Ivan Vargas2017-01-034-5/+7
* Fixed rspec tests for the project members also fixed the indexJose Ivan Vargas2017-01-0310-68/+24
* Moved the members (project_members)option to a single controller called membersJose Ivan Vargas2017-01-0314-43/+113
* Merge branch 'use-stable-icon-url' into 'master' Kamil Trzciński2017-01-034-2/+8
|\
| * Rename logo, apply for Slack tooZ.J. van de Weg2017-01-034-2/+8
| * Add logo in public filesZ.J. van de Weg2017-01-032-1/+1
| * Use stable icon for Mattermost integrationKamil Trzcinski2017-01-031-1/+1
* | Merge branch 'zj-revert-polymorphic-url' into 'master' Kamil Trzciński2017-01-031-3/+3
|\ \
| * | Revert specific URLzj-revert-polymorphic-urlZ.J. van de Weg2016-12-271-3/+3
* | | Merge branch 'project-avatar-fork' into 'master' Sean McGivern2017-01-035-7/+35
|\ \ \
| * | | Don't delete files from spec/fixturesJacob Vosmaer2017-01-031-3/+3
| * | | Copy, don't move uploaded avatar filesJacob Vosmaer2017-01-034-4/+32
* | | | Merge branch 'fix/cross-project-ref-path' into 'master' Sean McGivern2017-01-0321-55/+73
|\ \ \ \
| * | | | Fix cross-project references copy to include the project referencefix/cross-project-ref-pathJames Lopez2017-01-0321-55/+73
| | |_|/ | |/| |
* | | | Merge branch 'fix-double-line-issuable-page' into 'master' Annabel Dunstone Gray2017-01-031-0/+6
|\ \ \ \
| * | | | Remove bottom border from issuable titlesfix-double-line-issuable-pageAlfredo Sumaran2016-12-301-0/+6
* | | | | Minor improvements to changelog docsRobert Speicher2017-01-031-5/+10
* | | | | Merge branch 'fix-gemfile-lock-update' into 'master' Yorick Peterse2017-01-031-3/+3
|\ \ \ \ \
| * | | | | Fix Gemfile.lock for the octokit updatefix-gemfile-lock-updateYorick Peterse2017-01-031-3/+3
* | | | | | Merge branch 'minor-ruby-status-badge-changes' into 'master' Sean McGivern2017-01-031-3/+3
|\ \ \ \ \ \
| * | | | | | rewrite the item.respond_to?(:x?) && item.x? to item.try(:x?)dimitrieh2017-01-031-3/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'add-tests-to-cycle-analytics' into 'master' 26257-tooltip-hidden-pipeline-dropdownSean McGivern2017-01-033-3/+129
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Make haml_lint happyadd-tests-to-cycle-analyticsAlfredo Sumaran2017-01-021-1/+1
| * | | | | Improve specAlfredo Sumaran2017-01-021-11/+9
| * | | | | Add feature tests for Cycle AnalyticsAlfredo Sumaran2017-01-023-4/+132
| | |_|/ / | |/| | |
* | | | | Merge branch 'api-fix-extern-uid-validation' into 'master' Sean McGivern2017-01-032-3/+3
|\ \ \ \ \
| * | | | | API: extern_uid is a stringapi-fix-extern-uid-validationRobert Schilling2017-01-032-3/+3
| |/ / / /
* | | | | Merge branch 'octokit' into 'master' Sean McGivern2017-01-032-4/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update octokit to 4.6.2Manuel Rüger2016-12-302-4/+4
* | | | | Merge branch '26218-rety-button-pipeline-builds-name-drodown-broken' into 'ma...25564-uniquely-and-uniformly-style-status-badgesFatih Acet2017-01-022-2/+6
|\ \ \ \ \
| * | | | | Increases pipeline graph drowdown width in order to prevent strange position ...Filipa Lacerda2017-01-022-2/+6
|/ / / / /
* | | | | Merge branch 'remove-timezone-assertion-datetime-on-tooltips-spec' into 'mast...Alfredo Sumaran2017-01-021-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove time zone information from assertion in timeago tooltips specremove-timezone-assertion-datetime-on-tooltips-specAdam Niedzielski2016-12-301-1/+1
* | | | | Merge branch '22072-enable-haml-lints' into 'master' Alfredo Sumaran2016-12-31217-645/+634
|\ \ \ \ \
| * | | | | HAMLLint: Fix `ImplicitDiv` offence post-rebase22072-enable-haml-lintsKushal Pandya2016-12-311-1/+1
| * | | | | HAMLLint: Fix `TrailingWhitespace` offense post-rebaseKushal Pandya2016-12-311-1/+1
| * | | | | HAMLLint: Fix `SpaceInsideHashAttributes` offenceKushal Pandya2016-12-311-1/+1
| * | | | | HAMLLint: Fix `SpaceInsideHashAttributes` offencesKushal Pandya2016-12-31157-521/+514
| * | | | | HAMLLint: Enable `SpaceInsideHashAttributes` ruleKushal Pandya2016-12-311-1/+1