summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Removed the extra call to the form_errors helperfix-avatar-upload-message-errorJose Ivan Vargas2017-02-101-1/+0
* Added changelog entryJose Ivan Vargas2017-02-101-0/+4
* Add a form_errors helper to show form erorrs should they arise on the edit pr...Jose Ivan Vargas2017-02-101-0/+1
* Merge branch 'static-navbar' into 'master' Jacob Schatz2017-02-1022-70/+62
|\
| * Add js prefix to right sidebarAnnabel Dunstone Gray2017-02-105-5/+8
| * 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 '27987-skipped-pipeline-mr-graph' into 'master' Alfredo Sumaran2017-02-102-2/+7
|\
| * Add changelog27987-skipped-pipeline-mr-graphAnnabel Dunstone Gray2017-02-101-0/+4
| * Only show MR widget graph if there are stagesAnnabel Dunstone Gray2017-02-101-2/+3
* | Merge branch 'replace-teaspoon-references' into 'master' Clement Ho2017-02-104-22/+15
|\ \
| * | Replace teaspoon references with Karmareplace-teaspoon-referencesClement Ho2017-02-104-22/+15
* | | Merge branch '27783-fix-fe-doc-broken-link' into 'master' Filipa Lacerda2017-02-102-42/+48
|\ \ \
| * \ \ Merge branch 'master' into 27783-fix-fe-doc-broken-link27783-fix-fe-doc-broken-linkFilipa Lacerda2017-02-1013-20/+57
| |\ \ \ | | |/ /
| * | | moved hyperlink reference section at the end of the contentNur Rony2017-02-101-41/+43
| * | | adds changelogNur Rony2017-02-101-0/+4
| * | | fixes frontend doc broken linkNur Rony2017-02-101-1/+1
* | | | Merge branch 'revert-changes-from-9126' into 'master' Alfredo Sumaran2017-02-1014-167/+29
|\ \ \ \
| * | | | Revert "Merge branch 'add-additional-checks-to-ca-data' into 'master' "Alfredo Sumaran2017-02-1014-167/+29
|/ / / /
* | | | Merge branch '27963-tooltips-jobs' into 'master' Annabel Dunstone Gray2017-02-103-5/+15
|\ \ \ \
| * | | | Fix broken test to use trigger in order to not take tooltip overlaping in con...Filipa Lacerda2017-02-101-1/+1
| * | | | Merge branch 'master' into 27963-tooltips-jobsFilipa Lacerda2017-02-1020-21/+160
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into 27963-tooltips-jobs27963-tooltips-jobsFilipa Lacerda2017-02-102-3/+24
| |\ \ \ \ \
| * | | | | | Fix tooltip scss for anchors.Filipa Lacerda2017-02-102-4/+14
* | | | | | | Merge branch 'fix-job-to-pipeline-renaming' into 'master'Douwe Maan2017-02-105-7/+11
|\ \ \ \ \ \ \
| * | | | | | | Fix job to pipeline renamingFilipa Lacerda2017-02-105-7/+11
* | | | | | | | 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
|\ \ \ \ \ \ \ \ \