summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'user_filter_auth' into 'master' Rémy Coutable2016-11-141-1/+1
|\
| * Centralize LDAP config/filter logicDrew Blessing2016-11-111-1/+1
* | Merge branch '22307-pipeline-link-in-builds-view' into 'master' Kamil Trzciński2016-11-131-0/+4
|\ \ | |/ |/|
| * add link to build's pipeline within build page headerMike Greiling2016-11-101-0/+4
* | Merge branch 'sidekiq-job-throttling' into 'master' Douwe Maan2016-11-111-0/+4
|\ \
| * | Allow the Sidekiq queues to throttle and the factor by which to throttle them...Patricio Cano2016-11-101-0/+4
| |/
* | Merge branch '21764-build-page-title' into 'master' Fatih Acet2016-11-111-5/+2
|\ \ | |/ |/|
| * Removed soon-to-be un-needed project title additions from builds and environm...21764-build-page-titleLuke Bennett2016-11-091-5/+2
* | Merge branch 'remove-heading-space-from-diff-content' into 'master' Alfredo Sumaran2016-11-091-4/+3
|\ \
| * | Remove an extra leading space from diff contentHiroyuki Sato2016-11-041-4/+3
* | | Merge branch 'pipeline-notifications' into 'master' Sean McGivern2016-11-091-0/+9
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-085-27/+69
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-054-10/+22
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-025-3/+22
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-10-251-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-10-212-5/+9
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-10-207-34/+120
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Show it as successful pipeline, rather than success pipelineLin Jen-Shin2016-10-171-0/+9
* | | | | | | | | | Merge branch 'fix-unathorized-cloning' into 'security'Douwe Maan2016-11-091-2/+2
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge branch 'improve-build-scroll-controls-responsive-behaviour' into 'master' Fatih Acet2016-11-081-0/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Removed inline JS and added new affix declarationLuke Bennett2016-11-041-0/+10
* | | | | | | | | | Merge branch 'upgrade-timeago' into 'master' Fatih Acet2016-11-081-11/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Replace jQuery.timeago with timeago.jsClement Ho2016-11-071-11/+7
* | | | | | | | | | Merge branch 'use-separate-token-for-incoming-email' into 'master' Douwe Maan2016-11-081-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-emailtiagonbotelho2016-11-071-0/+5
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'todos-filter-empty-state' into 'master' Sean McGivern2016-11-081-0/+4
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Changed helper method to check for none on paramsPhil Hughes2016-11-081-1/+1
| * | | | | | | | | Fixed todos empty state when filteringtodos-filter-empty-statePhil Hughes2016-11-071-0/+4
* | | | | | | | | | Use the Gitlab Workhorse HTTP header in the admin dashboard21664-incorrect-workhorse-version-number-displayedChris Wright2016-11-071-0/+9
|/ / / / / / / / /
* | | | | | | | | Merge branch 'refactor-issuable-form-template_selector' into 'master' Robert Speicher2016-11-072-27/+51
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Refactor template selector in issuable formrefactor-issuable-form-template_selectorRémy Coutable2016-11-042-27/+51
| |/ / / / / / /
* | | | | | | | Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-043-4/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Allow multiple repository storage shards to be enabled, and automatically rou...Nick Thomas2016-11-041-2/+2
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch '22914-mini-graph-icons' into 'master' Fatih Acet2016-11-031-1/+3
| |\ \ \ \ \ \
| | * | | | | | Add new icon for skipped builds; show created state in mini graphAnnabel Dunstone Gray2016-11-031-1/+3
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Unify dropdown button stylesfile-toggleAnnabel Dunstone Gray2016-11-031-1/+1
| |/ / / / /
* | | | | | Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-041-0/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Correctly passes feature key into feature_available methodproject-activity-tabs-hidePhil Hughes2016-11-011-2/+2
| * | | | | Removed return statement that isn't neededPhil Hughes2016-11-011-1/+1
| * | | | | Hide project activity tabs when features are disabledPhil Hughes2016-11-011-0/+6
* | | | | | Merge status_for and status, feedback:Lin Jen-Shin2016-11-031-1/+1
* | | | | | Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-023-2/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'mr-copy-filename-btn-update' into 'master' Fatih Acet2016-11-011-1/+2
| |\ \ \ \ \
| | * | | | | Updated positioning of copy file path button in diffsmr-copy-filename-btn-updatePhil Hughes2016-10-311-1/+2
| * | | | | | Fix builds tab visibilityissue_23951Felipe Artur2016-10-311-1/+5
| |/ / / / /
| * | | | | add "x of y tasks completed" on issuableGuilherme Salazar2016-10-281-0/+8
* | | | | | Still show status from pipelines, see:Lin Jen-Shin2016-10-271-8/+11
* | | | | | Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-10-261-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix sidekiq stats in admin areablackst0ne2016-10-261-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-10-251-1/+1
|\ \ \ \ \ | |/ / / /