summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix position of counters within milestone panelsAndrew Smith2017-02-152-3/+23
* Merge branch '28029-improve-blockquote-formatting-on-emails' into 'master'Annabel Dunstone Gray2017-02-111-0/+7
|\
| * Stylize blockquote in notification emailsAlfredo Sumaran2017-02-101-0/+7
* | Merge branch 'clean-javascript-vendor-files' into 'master' Filipa Lacerda2017-02-115-5/+5
|\ \
| * | convert js-cookie dependency to an npm moduleclean-javascript-vendor-filesMike Greiling2017-02-113-3/+3
| * | convert timeago.js dependency to an npm moduleMike Greiling2017-02-112-2/+2
| |/
* | Merge branch '27994-fix-mr-widget-jump' into 'master' Filipa Lacerda2017-02-102-6/+6
|\ \ | |/ |/|
| * Merge branch 'master' into 27994-fix-mr-widget-jumpFilipa Lacerda2017-02-1023-57/+77
| |\
| * | fixes MR widget jumpNur Rony2017-02-102-6/+6
* | | 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
* | | 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 issue boards sidebar alignment and sidebar toggle specAnnabel Dunstone Gray2017-02-101-5/+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-103-6/+2
| |/ |/|
* | Merge branch '27987-skipped-pipeline-mr-graph' into 'master' Alfredo Sumaran2017-02-101-2/+3
|\ \
| * | Only show MR widget graph if there are stagesAnnabel Dunstone Gray2017-02-101-2/+3
| |/
* | Revert "Merge branch 'add-additional-checks-to-ca-data' into 'master' "Alfredo Sumaran2017-02-107-139/+29
* | Merge branch '27963-tooltips-jobs' into 'master' Annabel Dunstone Gray2017-02-101-4/+10
|\ \
| * \ Merge branch 'master' into 27963-tooltips-jobsFilipa Lacerda2017-02-108-15/+30
| |\ \
| * | | Fix tooltip scss for anchors.Filipa Lacerda2017-02-101-4/+10
| | |/ | |/|
* | | Merge branch 'fix-job-to-pipeline-renaming' into 'master'Douwe Maan2017-02-104-7/+7
|\ \ \
| * | | Fix job to pipeline renamingFilipa Lacerda2017-02-104-7/+7
* | | | Merge branch 'add-additional-checks-to-ca-data' into 'master' Alfredo Sumaran2017-02-107-29/+139
|\ \ \ \
| * | | | Make sure events have most properties definedAlfredo Sumaran2017-02-105-28/+137
| * | | | Restore exposure of legend property for eventsAlfredo Sumaran2017-02-102-1/+2
| | |/ / | |/| |
* | | | Merge branch 'rs-warden-blocked-users' into 'master' Robert Speicher2017-02-107-22/+16
|\ \ \ \
| * | | | Don't perform Devise trackable updates on blocked User recordsrs-warden-blocked-usersRobert Speicher2017-02-107-22/+16
* | | | | Merge branch 'issue-newproj-layout' into 'master' Rémy Coutable2017-02-102-7/+9
|\ \ \ \ \
| * | | | | Removed duplicate "Visibility Level" label on New Project pageRobert Marcano2017-02-092-7/+9
* | | | | | Merge branch '27336-add-environment-url-link-to-terminal-page' into 'master' Kamil Trzciński2017-02-101-0/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Added env external link and light web terminal spec27336-add-environment-url-link-to-terminal-pageLuke "Jared" Bennett2017-02-101-0/+2
* | | | | | Merge branch 'dz-nested-groups-members-page' into 'master' Dmitriy Zaporozhets2017-02-105-5/+27
|\ \ \ \ \ \
| * | | | | | Show parent group members for nested groupdz-nested-groups-members-pageDmitriy Zaporozhets2017-02-105-5/+27
| | |/ / / / | |/| | | |
* | | | | | Merge branch '27991-success-with-warnings-caret' into 'master' Alfredo Sumaran2017-02-101-7/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Remove orange caret icon from mr widget27991-success-with-warnings-caretAnnabel Dunstone Gray2017-02-101-7/+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
* | | | | Show Pipeline(not Job) in MR desktop notificationEric Eastwood2017-02-101-2/+2
| |/ / / |/| | |
* | | | Merge branch 'protected-branch-dropdown-titles' into 'master' Jacob Schatz2017-02-101-2/+6
|\ \ \ \
| * | | | Added header to protected branches access dropdownsprotected-branch-dropdown-titlesPhil Hughes2017-01-261-2/+6
View Lorry Controller Status