summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add js prefix to right sidebarstatic-navbarAnnabel Dunstone Gray2017-02-104-5/+5
* Replace accidentally deleted metaclickAnnabel Dunstone Gray2017-02-101-0/+8
* Remove right padding from navbar-collapse on large screensAnnabel Dunstone Gray2017-02-101-0/+4
* Add changelogAnnabel Dunstone Gray2017-02-101-0/+4
* common_utils merge conflictsAnnabel Dunstone Gray2017-02-101-3/+1
* Set sidebar height to 100% if at top of pageAnnabel Dunstone Gray2017-02-101-0/+2
* Set height of fixed sidebars with jsAnnabel Dunstone Gray2017-02-102-1/+11
* Add sticky sidebar on wiki pageAnnabel Dunstone Gray2017-02-102-2/+2
* Fix comment button test for slash commandsAnnabel Dunstone Gray2017-02-101-1/+1
* Fix time tracking specAnnabel Dunstone Gray2017-02-101-1/+1
* Fix issue boards sidebar alignment and sidebar toggle specAnnabel Dunstone Gray2017-02-102-6/+2
* Fix failing conflicts testAnnabel Dunstone Gray2017-02-101-1/+1
* Fix build sidebar scrollingAnnabel Dunstone Gray2017-02-101-16/+0
* Refactor JSAnnabel Dunstone Gray2017-02-101-3/+1
* Fix pinned sidebar alignmentAnnabel Dunstone Gray2017-02-101-1/+1
* Remove navbar height offsetsAnnabel Dunstone Gray2017-02-104-30/+5
* Keep sidebars absolute until fixed at top; remove unneeded JSAnnabel Dunstone Gray2017-02-108-17/+21
* Fix sidebar scrollingAnnabel Dunstone Gray2017-02-102-2/+12
* Remove fixed positioning from navbarAnnabel Dunstone Gray2017-02-104-7/+3
* Merge branch 'add-additional-checks-to-ca-data' into 'master' Alfredo Sumaran2017-02-1014-29/+167
|\
| * Make sure events have most properties definedAlfredo Sumaran2017-02-105-28/+137
| * Restore exposure of legend property for eventsAlfredo Sumaran2017-02-109-1/+30
* | Merge branch 'rs-warden-blocked-users' into 'master' Robert Speicher2017-02-1011-76/+54
|\ \
| * | Don't perform Devise trackable updates on blocked User recordsrs-warden-blocked-usersRobert Speicher2017-02-1011-76/+54
* | | Merge branch 'issue-newproj-layout' into 'master' Rémy Coutable2017-02-103-7/+13
|\ \ \
| * | | Removed duplicate "Visibility Level" label on New Project pageRobert Marcano2017-02-093-7/+13
* | | | Merge branch '1051-api-create-users-without-password' into 'master' Rémy Coutable2017-02-104-4/+33
|\ \ \ \
| * | | | Optionally make users created via the API set their passwordJoost Rijneveld2017-02-094-4/+33
* | | | | Merge branch '27336-add-environment-url-link-to-terminal-page' into 'master' Kamil Trzciński2017-02-103-0/+22
|\ \ \ \ \
| * | | | | Added env external link and light web terminal spec27336-add-environment-url-link-to-terminal-pageLuke "Jared" Bennett2017-02-103-0/+22
* | | | | | Merge branch 'sh-add-index-to-ci-trigger-requests' into 'master' Yorick Peterse2017-02-103-1/+18
|\ \ \ \ \ \
| * | | | | | Add index to ci_trigger_requests for commit_idsh-add-index-to-ci-trigger-requestsStan Hu2017-02-103-1/+18
* | | | | | | Merge branch 'dz-nested-groups-members-page' into 'master' Dmitriy Zaporozhets2017-02-108-5/+107
|\ \ \ \ \ \ \
| * | | | | | | Show parent group members for nested groupdz-nested-groups-members-pageDmitriy Zaporozhets2017-02-108-5/+107
* | | | | | | | Merge branch '27991-success-with-warnings-caret' into 'master' Alfredo Sumaran2017-02-102-7/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove orange caret icon from mr widget27991-success-with-warnings-caretAnnabel Dunstone Gray2017-02-102-7/+4
* | | | | | | | | Merge branch 'rspec-profiling-branch-name-in-ci' into 'master' Rémy Coutable2017-02-101-0/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rspec_profiling: Discover the correct branch name in GitLab CINick Thomas2017-02-101-0/+8
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'protected-branches-doc-update' into 'master' Sean Packham (GitLab)2017-02-101-0/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Updated protected branches dropdown image in docsprotected-branches-doc-updatePhil Hughes2017-02-101-0/+0
* | | | | | | | | | Merge branch 'user-dropdown-settings' into 'master' Alfredo Sumaran2017-02-101-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Make min width smaller for user settingsuser-dropdown-settingsAnnabel Dunstone Gray2017-02-091-1/+1
* | | | | | | | | | Merge branch 'issue_27855' into 'master' Rémy Coutable2017-02-101-5/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix admin_labels_spec.rb transient failureissue_27855Felipe Artur2017-02-101-5/+6
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '27955-mr-notification-use-pipeline-language' into 'master' Filipa Lacerda2017-02-102-2/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' into 27955-mr-notification-use-pipeline-languageFilipa Lacerda2017-02-105-9/+31
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' into 27955-mr-notification-use-pipeline-language27955-mr-notification-use-pipeline-languageFilipa Lacerda2017-02-104-4/+4
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Show Pipeline(not Job) in MR desktop notificationEric Eastwood2017-02-102-2/+6
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'test-for-current-gitlab-ci-yml' into 'master' Rémy Coutable2017-02-101-0/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Make sure our current .gitlab-ci.yml is validtest-for-current-gitlab-ci-ymlLin Jen-Shin2017-02-101-0/+10
| |/ / / / / / / /