Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move "I should see Crowd login form" feature to a view specrs-crowd-form-view-spec | Robert Speicher | 2016-02-24 | 5 | -38/+43 |
* | Merge branch 'feature/slack-notifications-on-ci' into 'master' | James Lopez | 2016-02-24 | 2 | -0/+54 |
|\ | |||||
| * | updated gitlab ci based on feedback | James Lopez | 2016-02-24 | 1 | -2/+2 |
| * | fix gitlab-ci.yml | James Lopez | 2016-02-22 | 1 | -3/+3 |
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/slack-n... | James Lopez | 2016-02-22 | 227 | -3633/+25421 |
| |\ | |||||
| * | | resolve merge conflict | James Lopez | 2016-02-18 | 1 | -1/+9 |
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/slack-n... | James Lopez | 2016-02-18 | 365 | -2260/+6005 |
| |\ \ | |||||
| * | | | default slack notification channel | James Lopez | 2016-02-08 | 1 | -1/+1 |
| * | | | update with branch and tags restriction | James Lopez | 2016-02-05 | 2 | -7/+6 |
| * | | | typo to make build fail | James Lopez | 2016-02-05 | 1 | -1/+1 |
| * | | | removed slack task and added bash script instead. Updated gitlab-ci config file | James Lopez | 2016-02-05 | 3 | -13/+20 |
| * | | | uncomment restriction to branches or tags | James Lopez | 2016-02-03 | 1 | -3/+3 |
| * | | | refactored rake task and make build pass | James Lopez | 2016-02-03 | 3 | -6/+5 |
| * | | | testing build failure | James Lopez | 2016-02-03 | 1 | -1/+2 |
| * | | | update gitlab ci config | James Lopez | 2016-02-03 | 1 | -1/+1 |
| * | | | make build fail so we can test notifications... | James Lopez | 2016-02-03 | 1 | -1/+1 |
| * | | | update ci configuration to send slack notifications on failure and added rake... | James Lopez | 2016-02-03 | 2 | -1/+41 |
* | | | | Merge branch 'andywgrant/gitlab-ce-master' into 'master' | Dmitriy Zaporozhets | 2016-02-24 | 2 | -6/+6 |
|\ \ \ \ | |||||
| * | | | | Add "issue" to Close/Reopen buttons for clarityandywgrant/gitlab-ce-master | Andy Grant | 2016-02-22 | 2 | -6/+6 |
* | | | | | Add 8.5.1 in CHANGELOG | Rémy Coutable | 2016-02-24 | 1 | -0/+17 |
* | | | | | Merge branch 'user-bio-improve' into 'master' | Jacob Schatz | 2016-02-24 | 3 | -18/+30 |
|\ \ \ \ \ | |||||
| * | | | | | Improve the formatting for the user page bioconnorshea/gitlab-ce-user-bio-improve | connorshea | 2016-02-23 | 3 | -18/+30 |
* | | | | | | Merge branch 'highlighted-note' into 'master' | Jacob Schatz | 2016-02-24 | 7 | -9/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | changed variable name to -hoverhighlighted-note | Phil Hughes | 2016-02-23 | 7 | -8/+8 |
| * | | | | | | Changed padding & background color for highlighted notes | Phil Hughes | 2016-02-23 | 2 | -2/+2 |
* | | | | | | | Merge branch 'gray-content-block-btn-alignment' into 'master' | Jacob Schatz | 2016-02-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Correctly aligned buttons vertical in gray-content-blockgray-content-block-btn-alignment | Phil Hughes | 2016-02-23 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'activity-tabs-single-select' into 'master' | Jacob Schatz | 2016-02-24 | 2 | -16/+14 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | changed bind to on for activity link click eventactivity-tabs-single-select | Phil Hughes | 2016-02-24 | 1 | -1/+1 |
| * | | | | | | | | fixed tests | Phil Hughes | 2016-02-24 | 1 | -3/+9 |
| * | | | | | | | | Treats activity tabs as single select | Phil Hughes | 2016-02-24 | 1 | -13/+5 |
* | | | | | | | | | Merge branch 'issue_13602' into 'master' | Rémy Coutable | 2016-02-24 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix look of tooltip for Revert button.issue_13602 | Rubén Dávila | 2016-02-19 | 1 | -2/+2 |
* | | | | | | | | | | Merge branch 'bugfix/jschatz1/missing-project-button' into 'master' | Rémy Coutable | 2016-02-24 | 3 | -9/+10 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Initialize navigation shortcuts on project's files pagebugfix/jschatz1/missing-project-button | Alfredo Sumaran | 2016-02-23 | 1 | -0/+1 |
| * | | | | | | | | | Re-use existing top area elements | Alfredo Sumaran | 2016-02-23 | 1 | -16/+0 |
| * | | | | | | | | | Fix group projects styles | Jacob Schatz | 2016-02-23 | 3 | -9/+25 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'bring-back-newrelic-gem' into 'master' | Rémy Coutable | 2016-02-24 | 3 | -0/+20 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Revert "Remove newrelic gem. Closes #12860" | Stan Hu | 2016-02-23 | 3 | -0/+20 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'issue_13301_emoji-menu' into 'master' | Robert Speicher | 2016-02-24 | 6 | -13/+32 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Update award_emoji test | Annabel Dunstone | 2016-02-23 | 2 | -3/+4 |
| * | | | | | | | | Create EmojisController | Annabel Dunstone | 2016-02-22 | 5 | -6/+8 |
| * | | | | | | | | Add timeout for ajax call in award emoji steps; update focus in award picker | Annabel Dunstone | 2016-02-19 | 2 | -1/+3 |
| * | | | | | | | | Load award emoji picker with ajax request | Annabel Dunstone | 2016-02-18 | 5 | -11/+25 |
* | | | | | | | | | Merge branch 'rs-update-raven' into 'master' | Robert Speicher | 2016-02-23 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update sentry-raven to 0.15.6 | Robert Speicher | 2016-02-23 | 2 | -3/+3 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'issue_13510' into 'master' | Jacob Schatz | 2016-02-23 | 3 | -0/+16 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update shortcuts image | Alfredo Sumaran | 2016-02-23 | 1 | -0/+0 |
| * | | | | | | | | | Add "e" shortcut to help modal | Alfredo Sumaran | 2016-02-23 | 1 | -0/+8 |
| * | | | | | | | | | Add "e" shortcut to edit issuableissue_13510 | Alfredo Sumaran | 2016-02-23 | 1 | -0/+8 |