summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Stub also `ensure_*` method in CI runners API specsci/persist-registration-tokenGrzegorz Bizon2015-12-111-0/+1
* Ensure that runners registration token is presentGrzegorz Bizon2015-12-113-3/+3
* Make sure that token `ensure_*` method always returns a tokenGrzegorz Bizon2015-12-112-3/+14
* Add specs for feature that regenerates runners tokenGrzegorz Bizon2015-12-111-0/+22
* Add CI runners registration token reset buttonGrzegorz Bizon2015-12-113-1/+19
* Use new runners registration token to register CI runnersGrzegorz Bizon2015-12-114-7/+12
* Display runners registration token in CI runners configGrzegorz Bizon2015-12-111-2/+5
* Ensure that app settings contains runners registration tokenGrzegorz Bizon2015-12-111-0/+2
* Add specs for `TokenAuthenticatable` concernGrzegorz Bizon2015-12-111-0/+50
* Use `save!` when generating new token in `TokenAuthenticatable`Grzegorz Bizon2015-12-111-1/+1
* Refactor `TokenAuthenticatable` to improve reusabilityGrzegorz Bizon2015-12-113-17/+30
* Add `runners_registration_token` to ApplicationSettingsGrzegorz Bizon2015-12-113-2/+8
* Merge branch 'zj/gitlab-ce-copying-file-seen-as-licence'Douwe Maan2015-12-113-3/+39
|\
| * Target right releaseZeger-Jan van de Weg2015-12-101-1/+1
| * Merge branch 'master' into copying-file-seen-as-licenceZeger-Jan van de Weg2015-12-101055-9051/+18539
| |\
| * | Licence also accepted as license fileZeger-Jan van de Weg2015-12-103-9/+26
| * | Set changelog item to right releaseZeger-Jan van de Weg2015-11-111-1/+1
| * | Merge branch 'master' into copying-file-seen-as-licenceZeger-Jan van de Weg2015-11-11653-4489/+10685
| |\ \
| * | | Add specs on #licenseZeger-Jan van de Weg2015-10-153-2/+17
| * | | Add changelog line to right releaseZeger-Jan van de Weg2015-10-141-2/+1
| * | | Prefer Licence over CopyingZeger-Jan van de Weg2015-10-141-3/+7
| * | | COPYING is now also accepted as licence fileZeger-Jan van de Weg2015-10-142-3/+5
* | | | Merge branch 'rs-update-gitlab_emoji' into 'master' Valery Sizov2015-12-112-2/+2
|\ \ \ \
| * | | | Bump gitlab_emoji to ~> 0.2.0rs-update-gitlab_emojiRobert Speicher2015-12-052-2/+2
* | | | | Update CHANGELOG for 7bb8bb85Stan Hu2015-12-101-0/+1
* | | | | Merge branch 'auth_hash_fix' into 'master' Stan Hu2015-12-112-3/+3
|\ \ \ \ \
| * | | | | AuthHash should not parameterize email userCorey Hinshaw2015-12-102-3/+3
* | | | | | Merge branch 'remove_check_icon_from_mr_page' into 'master' Dmitriy Zaporozhets2015-12-111-1/+0
|\ \ \ \ \ \
| * | | | | | Remove check icon from merged requestsremove_check_icon_from_mr_pageAchilleas Pipinellis2015-12-101-1/+0
* | | | | | | Merge branch 'bump-devise-3.5.3' into 'master' Dmitriy Zaporozhets2015-12-113-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Bump devise to 3.5.3 to fix reset token expiring after account creationStan Hu2015-12-103-3/+4
* | | | | | | | Merge pull request #9850 from davydovanton/doc-fix-typosStan Hu2015-12-105-7/+7
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Fix typos in all docs [skip ci]Anton Davydov2015-11-245-7/+7
* | | | | | | | Merge branch 'user_file_uploads_documentation' into 'master' Achilleas Pipinellis2015-12-102-1/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Document file upload random uuid securityDrew Blessing2015-12-102-1/+13
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'feature/sidekiq-4' into 'master' Dmitriy Zaporozhets2015-12-104-9/+21
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Upgraded Sidekiq to 4.xfeature/sidekiq-4Gabriel Mazetto2015-12-104-9/+21
* | | | | | | | Merge branch 'report-errors-on-service-creation' of https://gitlab.com/stanhu...Dmitriy Zaporozhets2015-12-103-2/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Add spec for invalid options in project creationStan Hu2015-12-091-0/+7
| * | | | | | | | Provide better diagnostic message upon project creation errorsStan Hu2015-12-092-2/+5
* | | | | | | | | Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master' Robert Speicher2015-12-105-8/+49
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Make selectors more specific when scroll to elementDouglas Barbosa Alexandre2015-12-101-1/+1
| * | | | | | | | Make selectors more specific when setting the tab contentDouglas Barbosa Alexandre2015-12-101-3/+3
| * | | | | | | | USe innerHtml to avoid slow performance on a MR with very large difffix-edit-notes-on-merge-request-diffDouglas Barbosa Alexandre2015-12-101-3/+2
| * | | | | | | | Merge branch 'master' into fix-edit-notes-on-merge-request-diffDouglas Barbosa Alexandre2015-12-09232-233/+453
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Update CHANGELOGDouglas Barbosa Alexandre2015-12-091-0/+1
| * | | | | | | | | Ensure new notes are highlighted properly on a merge request diffDouglas Barbosa Alexandre2015-12-091-3/+7
| * | | | | | | | | Ensure existing notes are highlighted properly on a merge request diffDouglas Barbosa Alexandre2015-12-091-1/+3
| * | | | | | | | | Ensure notes are replaced on a merge request diff when they're updatedDouglas Barbosa Alexandre2015-12-093-1/+36
* | | | | | | | | | Merge remote-tracking branch 'origin/emoji_edit_disallow'Dmitriy Zaporozhets2015-12-103-1/+19
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
View Lorry Controller Status